Fix #662

removeEventListener was missing the event name in a few cases.