Cleanup to the recent serialization code changes