Core/Util: A couple useful new functions for EventMap, as well as getting rid of some old junk