Removed dependence on C# token types.

Now we just make the token's class equal to its type.