Retain the debugging information when using broker-generated queues

Using a block provides access to the name attribute. We can switch to broker-generated queues without sacrificing the same level of debugging information.

This change adds the queue name back into the debugging information. Most of the line changes are whitespace to accomodate the indentation required of adding a block.