Additional sort-tool fixes.