
        Clean up serialization code a little

756fee4