Update #78: big Broker refactoring.