Break up event consolidation into type-specific functions