Improved handling of Listeners. They are not registered when feature
that needs specific Listener is disabled.