Lexer improvements