Zippers that appear to work fine with more tests

Left to see about whether the diff implementation is fast enough or low
enough on memory.