Cleanup and reorg.
In the process of including O inside the Seq parameters in ZipFullView