On second thought, the tests for what to do with stderr output are a

lot more sensible if we check the chunk-output case first.  Not
back-patched since it's just a cosmetic improvement.