Zip as much as possible in ZSA without repacking omni.ja, part 2