Improvements of Lexer.