Added wrapper around EventHandler::event that works with no arguments and simplified some event handling code