More fail (english is hard...)
Extracted BrokeredMessage creation into its own factory class.