events: misc cleanup

Found several small things that were either incorrect or not performant.
events: WIP