zip: missed a few things with recent changes.