Trivial tweaks to sort-merge.go