Cleaned up broker address binding and options.