Simplification in lexer/parser.