Do not keep the declaration for "%old".

This removes the need for exporting the theory about marks and thus the
resulting noise in the produced tasks. The patch is large due to the
dependencies between files.