Multiple subscribes need multiple listeners removed

Previously, assumption was only one subscribe, and only the last event
listener was removed.