Rework listeners.