Make test_marshal pass.  Not my best work. :-(
2 files changed