[sr-dev] git:master: modules/outbound: a bit of tidying up