replacing the package var with 2: package_name and package_safe, safe containing a zfs-safe package name - currently + replaced by _