Minor cleanups
Factorizing the hierarchy of SolutionListeners