Use bsdtar which depends on libarchive.
Minor clean up.