Convert some custom sort comparison functions to equivalent key functions.
12 files changed