Big reorg.  Push around the par-collections modules.
Begin to add a test that requires Generator of both IMap variants.