Always process using merge file

Rather than using the shells sometimes and merge file other times, always use the merge file and refer to the shells when it will give us indent information.

Most of the diff here is in reordering the output files to be alpha sorted, which should make future diffs easier to follow.