Various PKGBUILD shell-related touch ups