AMQP-205 Polishing; PR Comments