[EventDispatcher] toward cleaner events