Start refactoring serializer grammar