Incorporated all comments on https://github.com/Particular/NServiceBus/commit/8093ce907a3d558ecb59f20ef3be66593dbf11a4