This removes the ContactExchangeListener in favor of two new events.
ContactExchangeListener
Main part of #833