A quick cleanup and diff-ing of the serializer changes