Refactoring the parser.