AMQP-394 Polishing - PR Comments