QPID-6127: slight refactoring of previous solution for brevity; suggested by Andrew Stitcher.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1628462 13f79535-47bb-0310-9956-ffa450edef68