More work on AMQP framing