2 files changed, 30 insertions, 38 deletions
diff --git a/Completion/Unix/Command/_pkginfo b/Completion/Unix/Command/_pkginfo
index 6c71082ef..eca9e057e 100644
--- a/Completion/Unix/Command/_pkginfo
+++ b/Completion/Unix/Command/_pkginfo
@@ -1,22 +1,18 @@
 #compdef pkginfo
 
-_pkginfo() {
-	_arguments -s \
-	'(-q -r -x)-l[long listing]' \
-	'(-l -r -x)-q[quiet mode]' \
-	'(-l -q -x)-r[relocation base]' \
-	'(-l -q -r)-x[extracted listing]' \
-	'-c[category]:category: ' \
-	'-a[architecture]:architecture: ' \
-	'-v[version]:version: ' \
-	- set1 \
-	'(-p)-i[select completely installed packages]' \
-	'(-i)-p[select partially installed packages]' \
-	'-R[root path]:root path:_files -/' \
-	'*:package instance:_pkg_instance --_opts installed:set1--R' \
-	- set2 \
-	'-d[device]:device file:_files' \
-	'*:package instance:_pkg_instance --_opts uninstalled:set2--d'
-}
-
-_pkginfo "$@"
+_arguments -s \
+  '(-q -r -x)-l[long listing]' \
+  '(-l -r -x)-q[quiet mode]' \
+  '(-l -q -x)-r[relocation base]' \
+  '(-l -q -r)-x[extracted listing]' \
+  '-c[category]:category' \
+  '-a[architecture]:architecture' \
+  '-v[version]:version' \
+  - set1 \
+  '(-p)-i[select completely installed packages]' \
+  '(-i)-p[select partially installed packages]' \
+  '-R[root path]:root path:_files -/' \
+  '*:package instance:_pkg_instance --_opts installed:set1--R' \
+  - set2 \
+  '-d[device]:device file:_files' \
+  '*:package instance:_pkg_instance --_opts uninstalled:set2--d'
diff --git a/Completion/Unix/Command/_pkgrm b/Completion/Unix/Command/_pkgrm
index 25a950221..1191a2d1f 100644
--- a/Completion/Unix/Command/_pkgrm
+++ b/Completion/Unix/Command/_pkgrm
@@ -1,20 +1,16 @@
 #compdef pkgrm
 
-_pkgrm() {
-	_arguments -s \
-	'-Y[select packages by category]:category: ' \
-	- set1 \
-	'-n[non-interactive mode]' \
-	'-v[trace all scripts]' \
-	'-a[admin file]:admin file:_files' \
-	"-A[force removal of all files]" \
-	"-M[don't use vfstab file]" \
-	'-R[root path]:root path:_files -/' \
-	'-V[alternate vfstab file]:vfstab file:_files' \
-	'*:package instance:_pkg_instance --_opts installed:set1--R' \
-	- set2 \
-	'-s[spool package]:spool directory:_files -/' \
-	'*:package instance:_pkg_instance --_opts spooled:set2--s'
-}
-
-_pkgrm "$@"
+_arguments -s \
+  '-Y[select packages by category]:category' \
+  - set1 \
+  '-n[non-interactive mode]' \
+  '-v[trace all scripts]' \
+  '-a[admin file]:admin file:_files' \
+  "-A[force removal of all files]" \
+  "-M[don't use vfstab file]" \
+  '-R[root path]:root path:_files -/' \
+  '-V[alternate vfstab file]:vfstab file:_files' \
+  '*:package instance:_pkg_instance --_opts installed:set1--R' \
+  - set2 \
+  '-s[spool package]:spool directory:_files -/' \
+  '*:package instance:_pkg_instance --_opts spooled:set2--s'