Reinstate Marshal.dump tags

These are not fixed yet.