Simplifying lexer matches