make stderr logic same as original code

In particular, no `:stderr` option should be treated the same as `:merge`
(ie, `:merge` is the defailt)

In this area, we do have a very small functional difference
which should be noted on the main commit: whereas stderr/stdout
lines could have been interleaved in the past, they are now
always separated.