AMQP-347: Polishing