During the warnings removal effort, it was found that some classes that handled list sorting could be refactored to use less code and with a better design.