Fix incorrect usage of `removeEventListener`

We need to pass the same scope into `removeEventListener` that we used for `addEventListener`.