Made EventDispatcher work with plain callbacks