Changed handlers not to require the xid in their signature. Containted in the received message, or generated in them