
        Clean up serialization code a little

64dc954