Fix bug in event support

In cleanup, we were closing over one particular handlerList rather than looking at the list for the current event type