Incorporate Artur's suggestion to flatten all diffs into a single unicol...

...ored set