GenericParser-related refactoring.