Handling tarball unpacking a bit more gracefully

The previous unpack hack was not handling zips well.