Improve Lexer.