Lexer/TokenStreamParser now reference  enum constants directly where used heavily.