Clean up the last remaining legacy SortMode remnants. Also reformat all ViewHolder IDs to be properly unique and sequential.