Refactored to our own MessageSender/TopicClient factories. We'll be able to reuse what they build for us shortly.