Fix up MQ integration to deal with exchanges as well as queues