Fix token categories - pass constant types to parser.