Fix problems left over from upgrade of rubyzip gem.