I agree also, but really didn't want to do it in this PR.  I would refactor at least some of `sort.c` to deal with the sort type more flexibly, too.