Lexer improvements.
Lexer improvements.