Unzip more cleanly