Fix merge when all steps are not profiled

Bug 366
Minor formatting changes, no change to logic