More event refactoring work.