More event refactoring.