FIx leaky listeners

This is for #9418 
Nevermind -- I see those are different elements.