Moving logic around between Bubble & PopOverShell.
Stopped up the leak introduced with the refactor.
This is cleaner, anyway. We shouldn't have subclasses dealing with the details of attaching a listener.