Port more of EventManager.

Include minor syntax fixes and cleanup.