Minor change in OneShotListenerManager to increase performance in some relatively common case.