Merge "Fix a bug I introduced, and do more zip cleanup."