Format cleanups
Track dict pointers on the broker, to ensure proper cleanup at all times.