Cleaned up the EventManager constructor a bit.