More refactoring
More refactoring

Extracted out a few more functions from EventAdd.

drbartling/windowed_event_counter,drbartling/windowed_event_counter,drbartling/windowed_event_counter,drbartling/windowed_event_counter