Merge "Don't use `unzip -t` when `unzip -l` will do."