Remove wrappers for more listeners.