XXX These aren't the prettiest diffs in the world, but making them XXX nicer would require a bit of restructuring of the code and XXX possible amq protocol.
