80-char limits are the bane of this test-generation type of code (lots of embedded data structures) but it's worth trying to make it human readable, I think.