Also, stolenrays, this is really being anal, but you can also remove the CONTACT_SECRETARY_GENERAL_VOTE and CONTACT_TRADE_CORPORATION from CvEnums.h, CvInfos.cpp, CyEnumsInterfaces.cpp and the GlobalTypes.XML. A harmless assert throws up if you don't do this, because the list in CvLeaderHeadsInfos.XML doesn't match the GlobalTypes.
What I did was add in the missing CONTACT_SECRETARY_GENERAL_VOTE and CONTACT_TRADE_CORPORATION to CIV4LeaderHeadInfos
<!-- Afforess Advanced Diplomacy-->
<ContactRand>
<ContactType>CONTACT_PEACE_PRESSURE</ContactType>
<iContactRand>100</iContactRand>
</ContactRand>
<ContactRand>
<ContactType>CONTACT_EMBASSY</ContactType>
<iContactRand>25</iContactRand>
</ContactRand>
<ContactRand>
<ContactType>CONTACT_TRADE_STOP_TRADING</ContactType>
<iContactRand>20</iContactRand>
</ContactRand>
<ContactRand>
<ContactType>CONTACT_TRADE_JOIN_WAR</ContactType>
<iContactRand>10</iContactRand>
</ContactRand>
<ContactRand>
<ContactType>CONTACT_SECRETARY_GENERAL_VOTE</ContactType>
<iContactRand>10</iContactRand>
</ContactRand>
<ContactRand>
<ContactType>CONTACT_TRADE_MILITARY_UNITS</ContactType>
<iContactRand>15</iContactRand>
</ContactRand>
<ContactRand>
<ContactType>CONTACT_TRADE_WORKERS</ContactType>
<iContactRand>25</iContactRand>
</ContactRand>
<ContactRand>
<ContactType>CONTACT_TRADE_CONTACTS</ContactType>
<iContactRand>25</iContactRand>
</ContactRand>
<ContactRand>
<ContactType>CONTACT_TRADE_CORPORATION</ContactType>
<iContactRand>25</iContactRand>
</ContactRand>
<!-- Afforess Advanced Diplomacy-->
<!-- Afforess Advanced Diplomacy-->
<ContactDelay>
<ContactType>CONTACT_PEACE_PRESSURE</ContactType>
<iContactDelay>100</iContactDelay>
</ContactDelay>
<ContactDelay>
<ContactType>CONTACT_EMBASSY</ContactType>
<iContactDelay>25</iContactDelay>
</ContactDelay>
<ContactDelay>
<ContactType>CONTACT_TRADE_STOP_TRADING</ContactType>
<iContactDelay>20</iContactDelay>
</ContactDelay>
<ContactDelay>
<ContactType>CONTACT_TRADE_JOIN_WAR</ContactType>
<iContactDelay>20</iContactDelay>
</ContactDelay>
<ContactDelay>
<ContactType>CONTACT_SECRETARY_GENERAL_VOTE</ContactType>
<iContactDelay>15</iContactDelay>
</ContactDelay>
<ContactDelay>
<ContactType>CONTACT_TRADE_MILITARY_UNITS</ContactType>
<iContactDelay>20</iContactDelay>
</ContactDelay>
<ContactDelay>
<ContactType>CONTACT_TRADE_WORKERS</ContactType>
<iContactDelay>20</iContactDelay>
</ContactDelay>
<ContactDelay>
<ContactType>CONTACT_TRADE_CONTACTS</ContactType>
<iContactDelay>15</iContactDelay>
</ContactDelay>
<ContactDelay>
<ContactType>CONTACT_TRADE_CORPORATION</ContactType>
<iContactDelay>20</iContactDelay>
</ContactDelay>
<!-- Afforess Advanced Diplomacy-->
<!--Afforess Advanced Diplomacy-->
<ContactType>CONTACT_PEACE_PRESSURE</ContactType>
<ContactType>CONTACT_EMBASSY</ContactType>
<ContactType>CONTACT_TRADE_STOP_TRADING</ContactType>
<ContactType>CONTACT_TRADE_JOIN_WAR</ContactType>
<ContactType>CONTACT_SECRETARY_GENERAL_VOTE</ContactType>
<ContactType>CONTACT_TRADE_MILITARY_UNITS</ContactType>
<ContactType>CONTACT_TRADE_WORKERS</ContactType>
<ContactType>CONTACT_TRADE_CONTACTS</ContactType>
<ContactType>CONTACT_TRADE_CORPORATION</ContactType>
<!--Afforess Advanced Diplomacy-->
So now is the same as in GlobalTypes