Minor refactor of support sorting.