Improving lexer.