Split ListenerSupport into two classes.