4 files changed, 8 insertions, 11 deletions
diff --git a/Completion/User/_pbm b/Completion/User/_pbm
index 1f740ad31..0ff62c548 100644
--- a/Completion/User/_pbm
+++ b/Completion/User/_pbm
@@ -17,11 +17,8 @@ else
 fi
   
 if [[ $# -ne 0 || $+_in_pbm -ne 0 ]]; then
-  if (( ! $# )); then
-    _description files expl 'picture file'
-    set -- "$expl[@]"
-  fi
-  _path_files "$@" -g "$pat" || _files "$@" -g '*.(#i)p[bgp]m'
+  _wanted files expl 'picture file' _path_files "$@" -g "$pat" - ||
+      _files "$@" "$expl[@]" -g '*.(#i)p[bgp]m'
   return
 fi
 
@@ -772,6 +769,6 @@ zeisstopnm)
   ;;
 
 *)
-  _description files expl 'picture file'
-  _path_files "$expl[@]" -g "$pat" || _files "$expl[@]" -g '*.(#i)p[bgp]m'
+  _wanted files expl 'picture file' _path_files -g "$pat" ||
+      _files "$expl[@]" -g '*.(#i)p[bgp]m'
 esac
diff --git a/Completion/User/_pspdf b/Completion/User/_pspdf
index 7dbccbf48..9d230300e 100644
--- a/Completion/User/_pspdf
+++ b/Completion/User/_pspdf
@@ -6,7 +6,6 @@ local ret=1 expl
 #  gs gsbj gsdj gsdj500 gslj gslp gsnd ps2ascii
 
 _ps && ret=0
-_description files expl 'PDF file'
-_path_files "$expl[@]" -g '*.(#i)pdf'
+_wanted files expl 'PDF file' _path_files -g '*.(#i)pdf'
 
 return ret
diff --git a/Completion/User/_tiff b/Completion/User/_tiff
index 5f7cc7edb..10c31ca6e 100644
--- a/Completion/User/_tiff
+++ b/Completion/User/_tiff
@@ -13,7 +13,8 @@ if [[ $# -ne 0 || $+_in_tiff -ne 0 ]]; then
     _description files expl 'picture file'
     set -- "$expl[@]"
   fi
-  _path_files "$@" -g "$pat" || _files "$@" -g '*.(#i)tiff'
+  _wanted files expl 'picture file' _path_files "$@" -g "$pat" - ||
+      _files "$@" "$expl[@]" -g '*.(#i)tiff'
   return
 fi
 
diff --git a/Completion/User/_zdump b/Completion/User/_zdump
index 2f9a010c1..5fdb2b172 100644
--- a/Completion/User/_zdump
+++ b/Completion/User/_zdump
@@ -6,4 +6,4 @@ fi
 
 _arguments '-v[lowest possible]' \
            '-c[cutoff]:cutoff year:' \
-           '*:timezone:_path_files -W $_zoneinfo_dirs'
+           '*:timezone:_files -W _zoneinfo_dirs'