Issue #7396: fix -s, which was broken by the -j enhancement.