Fixing ambiguity in Lexer between keyword tokens and other token names