Fix EventDispatcher scope issue on addEventListener.
Get EventBroker working correctly.