Further serializer refactoring.