More work on suite grouping.