Remove ArraySorter class, and update dependents.