Refactored the --transport handling slightly, to allow for Qpid 0.14 (as used by Travis-CI).