Make token types also an actual type, not a string.