Avoid unnecessary Output groupings.

No changes in test output.
Updated changelog.