Refactor the MessageWireImpl to be less oriented towards channels and more towards actual protocol messages.  All invocations and returns from invocations are now located in this class. That may in fact be enough :-)
Move even more of the protocol into the wire :-)
Removing the generic way to send control messages, now it's all at API level, no ready-made packages :-)
Making the bloody obvious even more obvious :-)