"I find this much harder to read, ..."

I agree, but in my experience I'm never trying to wrap my head around the whole data structure by looking at the diff. Earlier tests weed out those 'macro' problems, and by the time I get to the tests that use eq_or_diff I'm looking for tiny things. So, for what it is worth, in my case the changed format wouldn't bother me one bit.