* Use transport::Result instead of TransportError * Split payer and terminator * Add SetTerminator instruction