HIVE-7068 Undesirable TODO. Remove an extra toString()