Improve sort order within a homotypic group (new Comparator) #3338