Updated currying to key off of listener, not event type.