Docs; serialization cleanup.