Clean up serialization semantics