Refactor the parser.