Minor cleanup.  Listener is never null.