WIP: Decouple BrokerOptions from Broker so that changing options
no longer causes a recompiile storm