Finish dealing with events

From #6359.