One is in this branch (in `EventHandlerHelper`).  Mostly it just all seems a bit clumsy somehow and I'd like us to try fix it.