Update for producing by default

Make the conditional statements surrounding the output file parameters
consistent with earlier in the file.