Clean up Token.h to account for methods added to Identifier class