koios.EventDispatch, code cleanup