pkgfs.sh: misc changes to collapse various conditionals into one line.