More cleanup in core::Event.