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