Core/Util: A couple useful new functions for EventMap, as well as getting rid of some old junk
Merge pull request #12135 from Trisjdc/event_map_extension

Core/Util: A couple useful new functions for EventMap