Cleanup: less redundancy in EventManager code