Simplify TokenType equality
Simplify token serialization