Zip: minor cleanups.