Yet another attempt at +rubyzip+ cleanup