Lexer improvements.