Continue cleaning up serialization stuff.