Cleanup to the recent serialization code changes
Merge pull request #412 from peastman/master

Cleanup to the recent serialization code changes