Cleaned up EventDispatcher a little.