Clarify and consolidate event handling requirements