Here's a version rediffed against test5-mm2.  The other patches, except 
for a little fuzz on 5/5, apply fine to either test5 or -mm2.

Cheers!

-Matt