WIP Cleanup of reductions to .flat implementation version.  Still fails in py2 for unclear reasons.