Load completions in separate files dynamically, get rid of have().

209 files changed, 23 insertions, 524 deletions

diff --git a/completions/_mock b/completions/_mock
index 55d7a0f2..583933d2 100644
--- a/completions/_mock
+++ b/completions/_mock
@@ -3,8 +3,6 @@
 
 # bash completion for mock
 
-have mock || return
-
 _mock()
 {
     local cur prev words cword split
diff --git a/completions/_modules b/completions/_modules
index c76ed66d..61523915 100644
--- a/completions/_modules
+++ b/completions/_modules
@@ -19,7 +19,7 @@
 
 # Test for existence of /etc/profile.d/modules.sh too because we may end up
 # being sourced before it and thus before the `module' alias has been defined.
-[ -f /etc/profile.d/modules.sh ] || have module || return
+[ -f /etc/profile.d/modules.sh ] || return 1
 
 _module_list ()
 {
diff --git a/completions/_subversion b/completions/_subversion
index 0ad3303f..f17a7116 100644
--- a/completions/_subversion
+++ b/completions/_subversion
@@ -3,8 +3,6 @@
 
 # svn completion
 
-have svn || return
-
 _svn()
 {
     local cur prev words cword
diff --git a/completions/_yum b/completions/_yum
index cf31da80..87f4b8b5 100644
--- a/completions/_yum
+++ b/completions/_yum
@@ -3,8 +3,6 @@
 
 # yum(8) completion
 
-have yum || return
-
 _yum_list()
 {
     if [[ "$1" == all ]] ; then
diff --git a/completions/_yum-utils b/completions/_yum-utils
index b11c95e3..2917e9ad 100644
--- a/completions/_yum-utils
+++ b/completions/_yum-utils
@@ -3,8 +3,6 @@
 
 # bash completion for repomanage
 
-have repomanage || return
-
 _repomanage()
 {
     local cur prev words cword split
diff --git a/completions/abook b/completions/abook
index 5f462942..a26f92df 100644
--- a/completions/abook
+++ b/completions/abook
@@ -1,7 +1,5 @@
 # abook(1) completion
 
-have abook || return
-
 _abook()
 {
     local cur prev words cword
diff --git a/completions/ant b/completions/ant
index 4ba13ab8..2af0bdc8 100644
--- a/completions/ant
+++ b/completions/ant
@@ -1,7 +1,5 @@
 # bash completion for ant and phing
 
-have ant || have phing || return
-
 _ant()
 {
     local cur prev words cword
@@ -59,9 +57,9 @@ _ant()
         COMPREPLY=( $( compgen -W '$targets' -- "$cur" ) )
     fi
 } &&
-have ant && { type complete-ant-cmd.pl &>/dev/null && \
-    complete -C complete-ant-cmd.pl -F _ant ant || complete -F _ant ant; }
-have phing && complete -F _ant phing
+complete -F _ant ant phing
+type complete-ant-cmd.pl &>/dev/null && \
+    complete -C complete-ant-cmd.pl -F _ant ant
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/apache2ctl b/completions/apache2ctl
index 7facbd2b..d9b10639 100644
--- a/completions/apache2ctl
+++ b/completions/apache2ctl
@@ -1,7 +1,5 @@
 # apache2ctl(1) completion
 
-have apache2ctl || return
-
 _apache2ctl()
 {
     local cur prev words cword
diff --git a/completions/apt b/completions/apt
index c020ab2b..8bddf6ad 100644
--- a/completions/apt
+++ b/completions/apt
@@ -1,6 +1,5 @@
 # Debian apt-get(8) completion.
 
-have apt-get &&
 _apt_get()
 {
     local cur prev words cword
@@ -75,7 +74,6 @@ complete -F _apt_get apt-get
 
 # Debian apt-cache(8) completion.
 #
-have apt-cache &&
 _apt_cache()
 {
     local cur prev words cword
diff --git a/completions/apt-build b/completions/apt-build
index 5400dbb9..2a11f221 100644
--- a/completions/apt-build
+++ b/completions/apt-build
@@ -1,7 +1,5 @@
 # Debian apt-build(1) completion.
 
-have apt-build || return
-
 _apt_build()
 {
     local cur prev words cword
diff --git a/completions/aptitude b/completions/aptitude
index 5ec8c618..b1274971 100644
--- a/completions/aptitude
+++ b/completions/aptitude
@@ -1,8 +1,6 @@
 # Debian aptitude(1) completion
 
-have aptitude || return
-
-have grep-status && {
+_have grep-status && {
 _comp_dpkg_hold_packages()
 {
     grep-status -P -e "^$1" -a -FStatus 'hold' -n -s Package
diff --git a/completions/asciidoc b/completions/asciidoc
index 19f8e84c..36b463c4 100644
--- a/completions/asciidoc
+++ b/completions/asciidoc
@@ -1,5 +1,3 @@
-have asciidoc || have a2x || return
-
 _asciidoc_doctype()
 {
     COMPREPLY+=( $( compgen -W 'article book manpage' -- "$cur" ) )
diff --git a/completions/aspell b/completions/aspell
index ae5b3366..7d940c68 100644
--- a/completions/aspell
+++ b/completions/aspell
@@ -1,7 +1,5 @@
 # bash completion for aspell
 
-have aspell || return
-
 _aspell_dictionary()
 {
     local datadir
diff --git a/completions/autoconf b/completions/autoconf
index ba6dd185..c3f6a3dc 100644
--- a/completions/autoconf
+++ b/completions/autoconf
@@ -1,6 +1,5 @@
 # Completions for autoconf tools
 
-have autoconf &&
 _autoconf()
 {
     local cur prev words cword split
@@ -38,7 +37,6 @@ _autoconf()
 } &&
 complete -F _autoconf autoconf
 
-have autoreconf || have autoheader &&
 _autoreconf()
 {
     local cur prev words cword split
@@ -77,7 +75,6 @@ _autoreconf()
 } &&
 complete -F _autoreconf autoreconf autoheader
 
-have autoscan || have autoupdate &&
 _autoscan()
 {
     local cur prev words cword split
diff --git a/completions/automake b/completions/automake
index 2080f252..f914b0ae 100644
--- a/completions/automake
+++ b/completions/automake
@@ -1,6 +1,5 @@
 # Completions for automake tools
 
-have automake &&
 _automake()
 {
     local cur prev words cword split
@@ -34,7 +33,6 @@ _automake()
 } &&
 complete -F _automake automake automake-1.11
 
-have aclocal &&
 _aclocal()
 {
     local cur prev words cword split
diff --git a/completions/autorpm b/completions/autorpm
index dea2d484..51c12fa2 100644
--- a/completions/autorpm
+++ b/completions/autorpm
@@ -1,7 +1,5 @@
 # autorpm(8) completion
 
-have autorpm || return
-
 _autorpm()
 {
     local cur prev words cword
diff --git a/completions/bind-utils b/completions/bind-utils
index dcb413a4..787ceeb9 100644
--- a/completions/bind-utils
+++ b/completions/bind-utils
@@ -1,7 +1,5 @@
 # bash completion for nslookup
 
-have nslookup || have host || return
-
 _bind_queryclass()
 {
     COMPREPLY+=( $( compgen -W 'IN CH HS ANY' -- "$cur" ) )
diff --git a/completions/bitkeeper b/completions/bitkeeper
index 8f1d9490..abb3dbca 100644
--- a/completions/bitkeeper
+++ b/completions/bitkeeper
@@ -1,7 +1,5 @@
 # BitKeeper completion adapted from code by  Bart Trojanowski <bart@jukie.net>
 
-have bk || return
-
 _bk()
 {
     local cur prev words cword
diff --git a/completions/bittorrent b/completions/bittorrent
index ba940750..ea0f781a 100644
--- a/completions/bittorrent
+++ b/completions/bittorrent
@@ -1,8 +1,5 @@
 # btdownloadheadless(1) completion
 
-have btdownloadheadless.py || have btdownloadcurses.py || \
-    have btdownloadgui.py || return
-
 _btdownload()
 {
     local cur prev words cword
diff --git a/completions/bluez b/completions/bluez
index 74acdb4c..b130b9d3 100644
--- a/completions/bluez
+++ b/completions/bluez
@@ -1,7 +1,5 @@
 # bash completion for bluez utils
 
-have hcitool || return
-
 _bluetooth_adresses()
 {
     if [ -n "${COMP_BLUETOOTH_SCAN:-}" ]; then
diff --git a/completions/brctl b/completions/brctl
index 8ae7dab7..ced11cef 100644
--- a/completions/brctl
+++ b/completions/brctl
@@ -1,7 +1,5 @@
 # bash completion for brctl
 
-have brctl || return
-
 _brctl()
 {
     local cur prev words cword
diff --git a/completions/bzip2 b/completions/bzip2
index 7b75a76c..f7d615ea 100644
--- a/completions/bzip2
+++ b/completions/bzip2
@@ -1,7 +1,5 @@
 # bash completion for bzip2
 
-have bzip2 || have pbzip2 || have lbzip2 || return
-
 _bzip2()
 {
     local cur prev words cword
diff --git a/completions/cal b/completions/cal
index e2195a6d..f6fafb59 100644
--- a/completions/cal
+++ b/completions/cal
@@ -1,5 +1,3 @@
-have cal || have ncal || return
-
 _cal()
 {
     local cur prev words cword
diff --git a/completions/cardctl b/completions/cardctl
index da95f6d1..6ed4558d 100644
--- a/completions/cardctl
+++ b/completions/cardctl
@@ -1,7 +1,5 @@
 # Linux cardctl(8) completion
 
-have cardctl || have pccardctl || return
-
 _cardctl()
 {
     local cur prev words cword
diff --git a/completions/cfengine b/completions/cfengine
index d959b79f..34f4dcf2 100644
--- a/completions/cfengine
+++ b/completions/cfengine
@@ -1,7 +1,5 @@
 # bash completion for cfengine
 
-have cfagent || return
-
 _cfagent()
 {
     local cur prev words cword
diff --git a/completions/chkconfig b/completions/chkconfig
index 3a6651ed..1a640ff1 100644
--- a/completions/chkconfig
+++ b/completions/chkconfig
@@ -1,7 +1,5 @@
 # chkconfig(8) completion
 
-have chkconfig || return
-
 _chkconfig()
 {
     local cur prev words cword split
diff --git a/completions/chrpath b/completions/chrpath
index 5d40203a..89889c3b 100644
--- a/completions/chrpath
+++ b/completions/chrpath
@@ -1,5 +1,3 @@
-have chrpath || return
-
 _chrpath()
 {
     local cur prev words cword
diff --git a/completions/chsh b/completions/chsh
index c19e436c..fd25d672 100644
--- a/completions/chsh
+++ b/completions/chsh
@@ -1,7 +1,5 @@
 # chsh(1) completion
 
-have chsh || return
-
 _chsh()
 {
     local cur prev words cword
diff --git a/completions/cksfv b/completions/cksfv
index f5fcab38..87f3253d 100644
--- a/completions/cksfv
+++ b/completions/cksfv
@@ -1,7 +1,5 @@
 # cksfv completion by Chris <xris@forevermore.net>
 
-have cksfv || return
-
 _cksfv()
 {
     local cur prev words cword
diff --git a/completions/clisp b/completions/clisp
index dc0f2cdd..b2ea0c18 100644
--- a/completions/clisp
+++ b/completions/clisp
@@ -1,8 +1,6 @@
 # bash brogrammable completion for various Common Lisp implementations by
 # Nikodemus Siivola <nikodemus@random-state.net>
 
-have clisp || return
-
 _clisp()
 {
     local cur prev words cword
diff --git a/completions/configure b/completions/configure
index af1c736a..2127571b 100644
--- a/completions/configure
+++ b/completions/configure
@@ -1,7 +1,5 @@
 # bash completion for configure
 
-# No "have configure" here on purpose, it's rarely in any $PATH
-
 _configure()
 {
     local cur prev words cword split
diff --git a/completions/coreutils b/completions/coreutils
index d4a5558d..4b40b15f 100644
--- a/completions/coreutils
+++ b/completions/coreutils
@@ -2,7 +2,6 @@
 
 # chown(1) completion
 #
-have chown &&
 _chown()
 {
     local cur prev words cword split
@@ -49,7 +48,6 @@ complete -F _chown chown
 
 # chgrp(1) completion
 #
-have chgrp &&
 _chgrp()
 {
     local cur prev words cword split
@@ -89,7 +87,6 @@ complete -F _chgrp chgrp
 
 # id(1) completion
 #
-have id &&
 _id()
 {
     local cur prev words cword
@@ -107,7 +104,6 @@ complete -F _id id
 
 # mktemp(1) completion
 #
-have mktemp &&
 _mktemp()
 {
     local cur prev words cword split
diff --git a/completions/cowsay b/completions/cowsay
index 723a236b..86df189b 100644
--- a/completions/cowsay
+++ b/completions/cowsay
@@ -1,7 +1,5 @@
 # bash completion for cowsay
 
-have cowsay || return
-
 _cowsay()
 {
     local cur prev words cword
diff --git a/completions/cpan2dist b/completions/cpan2dist
index 9845a0a5..529bf013 100644
--- a/completions/cpan2dist
+++ b/completions/cpan2dist
@@ -1,7 +1,5 @@
 # bash completion for cpan2dist
 
-have cpan2dist || return
-
 _cpan2dist()
 {
     local cur prev words cword
diff --git a/completions/cpio b/completions/cpio
index 7671c7f7..ce299149 100644
--- a/completions/cpio
+++ b/completions/cpio
@@ -1,7 +1,5 @@
 # bash completion for cpio
 
-have cpio || return
-
 _cpio_format()
 {
     COMPREPLY=( $( compgen -W 'bin odc newc crc tar ustar hpbin hpodc' -- "$cur" ) )
diff --git a/completions/cppcheck b/completions/cppcheck
index befd109b..cb15f730 100644
--- a/completions/cppcheck
+++ b/completions/cppcheck
@@ -1,7 +1,5 @@
 # bash completion for cppcheck(1)
 
-have cppcheck || return
-
 _cppcheck()
 {
     local cur prev words cword split
diff --git a/completions/crontab b/completions/crontab
index e043a111..ca233769 100644
--- a/completions/crontab
+++ b/completions/crontab
@@ -1,7 +1,5 @@
 # crontab(1) completion
 
-have crontab || return
-
 _crontab()
 {
     local cur prev words cword
diff --git a/completions/cryptsetup b/completions/cryptsetup
index 9b29a548..566c4f73 100644
--- a/completions/cryptsetup
+++ b/completions/cryptsetup
@@ -1,7 +1,5 @@
 # bash completion for cryptsetup
 
-have cryptsetup || return
-
 _cryptsetup_name()
 {
     COMPREPLY=( $( compgen -X control -W '$( command ls /dev/mapper )' \
diff --git a/completions/cups b/completions/cups
index dcd8f2c9..2a2ab4db 100644
--- a/completions/cups
+++ b/completions/cups
@@ -1,6 +1,5 @@
 # bash completion for cups
 
-have cancel &&
 _cancel()
 {
     local cur prev words cword
@@ -10,7 +9,6 @@ _cancel()
 } &&
 complete -F _cancel cancel
 
-have lpr &&
 _lpr()
 {
     local cur prev words cword
@@ -41,7 +39,6 @@ _lpr()
 } &&
 complete -F _lpr lpr
 
-have lpq &&
 _lpq()
 {
     local cur prev words cword
diff --git a/completions/curl b/completions/curl
index 1fb96d69..a0060415 100644
--- a/completions/curl
+++ b/completions/curl
@@ -1,5 +1,3 @@
-have curl || return
-
 _curl()
 {
     local cur prev words cword
diff --git a/completions/cvs b/completions/cvs
index 05a7c7ea..7baeb976 100644
--- a/completions/cvs
+++ b/completions/cvs
@@ -1,7 +1,5 @@
 # cvs(1) completion
 
-have cvs || return
-
 _cvs_entries()
 {
     local prefix=${cur%/*}/ IFS=$'\n'
diff --git a/completions/cvsps b/completions/cvsps
index f22b7a46..e74e7c68 100644
--- a/completions/cvsps
+++ b/completions/cvsps
@@ -1,7 +1,5 @@
 # bash completion for cvsps
 
-have cvsps || return
-
 _cvsps()
 {
     local cur prev words cword
diff --git a/completions/dd b/completions/dd
index d6e9e87a..1c4452eb 100644
--- a/completions/dd
+++ b/completions/dd
@@ -1,7 +1,5 @@
 # bash completion for dd
 
-have dd || return
-
 _dd()
 {
     local cur prev words cword
diff --git a/completions/dhclient b/completions/dhclient
index add77e87..2922296b 100644
--- a/completions/dhclient
+++ b/completions/dhclient
@@ -1,7 +1,5 @@
 # bash completion for dhclient
 
-have dhclient || return
-
 _dhclient()
 {
     local cur prev words cword
diff --git a/completions/dict b/completions/dict
index 2bab183b..394c1db5 100644
--- a/completions/dict
+++ b/completions/dict
@@ -1,7 +1,5 @@
 # dict(1) completion
 
-have dict || have rdict || return
-
 _dictdata()
 {
     dict $host $port $1 2>/dev/null | sed -ne \
diff --git a/completions/dot b/completions/dot
index cd53598f..7193ce85 100644
--- a/completions/dot
+++ b/completions/dot
@@ -1,7 +1,5 @@
 # dot(1) completion
 
-have dot || return
-
 _dot()
 {
     local cur prev words cword
diff --git a/completions/dpkg b/completions/dpkg
index d6ae6bc9..068e809b 100644
--- a/completions/dpkg
+++ b/completions/dpkg
@@ -1,6 +1,6 @@
 # This function is required by _dpkg() and _dpkg-reconfigure()
-have dpkg && {
-have grep-status && {
+
+_have grep-status && {
 _comp_dpkg_installed_packages()
 {
     grep-status -P -e "^$1" -a -FStatus 'install ok installed' -n -s Package
@@ -66,11 +66,9 @@ _dpkg()
     [[ $COMPREPLY == *= ]] && compopt -o nospace
 } &&
 complete -F _dpkg dpkg dpkg-deb
-}
 
 # Debian GNU dpkg-reconfigure(8) completion
 #
-have dpkg-reconfigure &&
 _dpkg_reconfigure()
 {
     local cur prev words cword
@@ -103,7 +101,6 @@ complete -F _dpkg_reconfigure -o default dpkg-reconfigure
 
 # Debian dpkg-source completion
 #
-have dpkg-source &&
 _dpkg_source()
 {
     local cur prev words cword
diff --git a/completions/dselect b/completions/dselect
index 2923414c..94894586 100644
--- a/completions/dselect
+++ b/completions/dselect
@@ -1,7 +1,5 @@
 # Debian Linux dselect(8) completion.
 
-have dselect || return
-
 _dselect()
 {
     local cur prev words cword
diff --git a/completions/dsniff b/completions/dsniff
index f1c24002..1265e6bb 100644
--- a/completions/dsniff
+++ b/completions/dsniff
@@ -1,6 +1,5 @@
 # dsniff util completion
 
-have arpspoof &&
 _arpspoof()
 {
     local cur prev words cword
@@ -26,7 +25,6 @@ _arpspoof()
 } &&
 complete -F _arpspoof arpspoof
 
-have dnsspoof &&
 _dnsspoof()
 {
     local cur prev words cword
@@ -50,7 +48,6 @@ _dnsspoof()
 } &&
 complete -F _dnsspoof dnsspoof
 
-have dsniff &&
 _dsniff()
 {
     local cur prev words cword
@@ -74,7 +71,6 @@ _dsniff()
 } &&
 complete -F _dsniff dsniff
 
-have filesnarf || have mailsnarf || have msgsnarf &&
 _snarf()
 {
     local cur prev words cword
@@ -94,7 +90,6 @@ _snarf()
 } &&
 complete -F _snarf filesnarf mailsnarf msgsnarf
 
-have macof &&
 _macof()
 {
     local cur prev words cword
@@ -115,7 +110,6 @@ _macof()
 } &&
 complete -F _macof macof
 
-have sshmitm &&
 _sshmitm()
 {
     local cur prev words cword
@@ -130,7 +124,6 @@ _sshmitm()
 } &&
 complete -F _sshmitm sshmitm
 
-have sshow &&
 _sshow()
 {
     local cur prev words cword
@@ -150,7 +143,6 @@ _sshow()
 } &&
 complete -F _sshow sshow
 
-have tcpkill &&
 _tcpkill()
 {
     local cur prev words cword
@@ -170,7 +162,6 @@ _tcpkill()
 } &&
 complete -F _tcpkill tcpkill
 
-have tcpnice &&
 _tcpnice()
 {
     local cur prev words cword
@@ -190,7 +181,6 @@ _tcpnice()
 } &&
 complete -F _tcpnice tcpnice
 
-have urlsnarf &&
 _urlsnarf()
 {
     local cur prev words cword
@@ -210,7 +200,6 @@ _urlsnarf()
 } &&
 complete -F _urlsnarf urlsnarf
 
-have webmitm &&
 _webmitm()
 {
     local cur prev words cword
diff --git a/completions/dvd+rw-tools b/completions/dvd+rw-tools
index 83ecd8ce..c2d61a76 100644
--- a/completions/dvd+rw-tools
+++ b/completions/dvd+rw-tools
@@ -1,7 +1,5 @@
 # dvd+rw-tools completions
 
-have growisofs || return
-
 _growisofs()
 {
     local cur prev words cword
diff --git a/completions/e2fsprogs b/completions/e2fsprogs
index 32520c04..1f5753be 100644
--- a/completions/e2fsprogs
+++ b/completions/e2fsprogs
@@ -1,6 +1,5 @@
 # bash completion for e2fsprogs
 
-have badblocks &&
 _badblocks()
 {
     local cur prev words cword
@@ -31,7 +30,6 @@ _badblocks()
 complete -F _badblocks badblocks
 
 
-have dumpe2fs &&
 _dumpe2fs()
 {
     local cur prev words cword
@@ -58,7 +56,6 @@ _dumpe2fs()
 complete -F _dumpe2fs dumpe2fs
 
 
-have e2freefrag &&
 _e2freefrag()
 {
     local cur prev words cword
@@ -81,7 +78,6 @@ _e2freefrag()
 complete -F _e2freefrag e2freefrag
 
 
-have e2label &&
 _e2label()
 {
     local cur prev words cword
@@ -95,7 +91,6 @@ _e2label()
 complete -F _e2label e2label
 
 
-have filefrag &&
 _filefrag()
 {
     local cur prev words cword
@@ -111,7 +106,6 @@ _filefrag()
 complete -F _filefrag filefrag
 
 
-have tune2fs &&
 _tune2fs()
 {
     local cur prev words cword
diff --git a/completions/evince b/completions/evince
index 93f35bd6..aa5feffe 100644
--- a/completions/evince
+++ b/completions/evince
@@ -1,5 +1,3 @@
-have evince || return
-
 _evince()
 {
     local cur prev words cword split
diff --git a/completions/feh b/completions/feh
index 53ed5589..e71386a8 100644
--- a/completions/feh
+++ b/completions/feh
@@ -1,7 +1,5 @@
 # bash completion for feh(1)
 
-have feh || return
-
 _feh()
 {
     local cur prev words cword split
diff --git a/completions/file b/completions/file
index 9b190eb2..6ef5562c 100644
--- a/completions/file
+++ b/completions/file
@@ -1,5 +1,3 @@
-have file || return
-
 _file()
 {
     local cur prev words cword
diff --git a/completions/findutils b/completions/findutils
index cd1c4404..1d3a2822 100644
--- a/completions/findutils
+++ b/completions/findutils
@@ -2,8 +2,6 @@
 # globs and contains Linux specific code for completing the parameter
 # to the -fstype option.
 
-have find || return
-
 _find()
 {
     local cur prev words cword
diff --git a/completions/freeciv b/completions/freeciv
index 71bb1168..6f1d346b 100644
--- a/completions/freeciv
+++ b/completions/freeciv
@@ -1,6 +1,5 @@
 # freeciv completions
 
-have civserver || have freeciv-server &&
 _civserver()
 {
     local cur prev words cword
@@ -20,7 +19,6 @@ _civserver()
 } &&
 complete -F _civserver civserver freeciv-server
 
-have civclient || have freeciv-gtk2 || have freeciv-sdl || have freeciv-xaw &&
 _civclient()
 {
     local cur prev words cword
diff --git a/completions/freerdp b/completions/freerdp
index 93f4119b..bf4cc609 100644
--- a/completions/freerdp
+++ b/completions/freerdp
@@ -1,7 +1,5 @@
 # bash completion for xfreerdp
 
-have xfreerdp || return
-
 _xfreerdp()
 {
     local cur prev words cword
diff --git a/completions/fuse b/completions/fuse
index 45b74234..5c05e093 100644
--- a/completions/fuse
+++ b/completions/fuse
@@ -1,7 +1,5 @@
 # bash completion for fuse
 
-have fusermount || return
-
 _fusermount()
 {
     local cur prev words cword
diff --git a/completions/gcc b/completions/gcc
index 306bbd4f..6da9ffe8 100644
--- a/completions/gcc
+++ b/completions/gcc
@@ -8,8 +8,6 @@
 # ask the driver ("g++") for the name of the compiler ("cc1"), and parse the
 # --help output of the compiler.
 
-have gcc || return
-
 _gcc()
 {
     local cur prev words cword
@@ -49,8 +47,7 @@ _gcc()
 } &&
 complete -F _gcc gcc g++ c++ g77 gcj gpc
 
-[[ $USERLAND == GNU || $UNAME == Cygwin ]] && \
-[ -n "${have:-}" ] && complete -F _gcc cc
+[[ $USERLAND == GNU || $UNAME == Cygwin ]] && _have gcc && complete -F _gcc cc
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/gcl b/completions/gcl
index d4e0cb33..f235d59a 100644
--- a/completions/gcl
+++ b/completions/gcl
@@ -1,8 +1,6 @@
 # bash programmable completion for various Common Lisp implementations by
 # Nikodemus Siivola <nikodemus@random-state.net>
 
-have gcl || return
-
 _gcl()
 {
     local cur prev words cword
diff --git a/completions/gdb b/completions/gdb
index 1d3489b1..5dc832a8 100644
--- a/completions/gdb
+++ b/completions/gdb
@@ -1,7 +1,5 @@
 # bash completion for gdb
 
-have gdb || return
-
 _gdb()
 {
     local cur prev words cword
diff --git a/completions/genisoimage b/completions/genisoimage
index 77d72627..b4b11191 100644
--- a/completions/genisoimage
+++ b/completions/genisoimage
@@ -1,7 +1,5 @@
 # bash completion for mkisofs/genisoimage
 
-have mkisofs || have genisoimage || return
-
 _mkisofs()
 {
     local cur prev words cword
diff --git a/completions/getent b/completions/getent
index 012c229a..34214442 100644
--- a/completions/getent
+++ b/completions/getent
@@ -1,7 +1,5 @@
 # bash completion for getent
 
-have getent || return
-
 _getent()
 {
     local cur prev words cword split
diff --git a/completions/gkrellm b/completions/gkrellm
index 2b8cee87..9e915134 100644
--- a/completions/gkrellm
+++ b/completions/gkrellm
@@ -1,7 +1,5 @@
 # gkrellm(1) completion
 
-have gkrellm || have gkrellm2 || return
-
 _gkrellm()
 {
     local cur prev words cword
diff --git a/completions/gnatmake b/completions/gnatmake
index 540e6e18..9aac664c 100644
--- a/completions/gnatmake
+++ b/completions/gnatmake
@@ -1,7 +1,5 @@
 # Gnatmake completion by Ralf_Schroth@t-online.de (Ralf Schroth)
 
-have gnatmake || return
-
 _gnatmake()
 {
     local cur prev words cword
diff --git a/completions/gnome-mplayer b/completions/gnome-mplayer
index ee936843..396c8994 100644
--- a/completions/gnome-mplayer
+++ b/completions/gnome-mplayer
@@ -1,5 +1,3 @@
-have gnome-mplayer || return
-
 _gnome_mplayer()
 {
     local cur prev words cword split
diff --git a/completions/gpg b/completions/gpg
index 8e16f305..233c7d4e 100644
--- a/completions/gpg
+++ b/completions/gpg
@@ -1,7 +1,5 @@
 # bash completion for gpg
 
-have gpg || return
-
 _gpg()
 {
     local cur prev words cword
diff --git a/completions/gpg2 b/completions/gpg2
index 1a4649c8..7ffc8e24 100644
--- a/completions/gpg2
+++ b/completions/gpg2
@@ -1,7 +1,5 @@
 # gpg2(1) completion
 
-have gpg2 || return
-
 _gpg2()
 {
     local cur prev words cword
diff --git a/completions/gprof b/completions/gprof
index 6c0aa78b..66067740 100644
--- a/completions/gprof
+++ b/completions/gprof
@@ -1,5 +1,3 @@
-have gprof || return
-
 _gprof()
 {
     local cur prev words cword split
diff --git a/completions/gzip b/completions/gzip
index 3b33de11..4cc10c02 100644
--- a/completions/gzip
+++ b/completions/gzip
@@ -1,7 +1,5 @@
 # bash completion for gzip
 
-have gzip || have pigz || return
-
 _gzip()
 {
     local cur prev words cword
diff --git a/completions/hddtemp b/completions/hddtemp
index 3e9f8256..e0afc40c 100644
--- a/completions/hddtemp
+++ b/completions/hddtemp
@@ -1,7 +1,5 @@
 # hddtemp(8) completion
 
-have hddtemp || return
-
 _hddtemp()
 {
     local cur prev words cword split
diff --git a/completions/heimdal b/completions/heimdal
index fb36f4cb..01744fad 100644
--- a/completions/heimdal
+++ b/completions/heimdal
@@ -1,7 +1,5 @@
 # bash completion for heimdal
 
-have ktutil || return
-
 _heimdal_principals()
 {
     COMPREPLY=( $( compgen -W "$( kadmin -l dump 2>/dev/null | \
diff --git a/completions/hping2 b/completions/hping2
index f30aa675..dfdd3c21 100644
--- a/completions/hping2
+++ b/completions/hping2
@@ -1,7 +1,5 @@
 # bash completion for hping2
 
-have hping || have hping2 || have hping3 || return
-
 _hping2()
 {
     local cur prev words cword
diff --git a/completions/htpasswd b/completions/htpasswd
index 7d4898b9..76b82aa4 100644
--- a/completions/htpasswd
+++ b/completions/htpasswd
@@ -1,7 +1,5 @@
 # htpasswd(1) completion
 
-have htpasswd || return
-
 _htpasswd()
 {
     local cur prev words cword
diff --git a/completions/iconv b/completions/iconv
index 16e39037..7c4dc086 100644
--- a/completions/iconv
+++ b/completions/iconv
@@ -1,7 +1,5 @@
 # iconv(1) completion
 
-have iconv || return
-
 _iconv()
 {
     local cur prev words cword split
diff --git a/completions/idn b/completions/idn
index fba95f03..8b57ef3d 100644
--- a/completions/idn
+++ b/completions/idn
@@ -1,5 +1,3 @@
-have idn || return
-
 _idn()
 {
     local cur prev words cword split
diff --git a/completions/iftop b/completions/iftop
index 29b48cd7..8e995771 100644
--- a/completions/iftop
+++ b/completions/iftop
@@ -1,7 +1,5 @@
 # iftop(8) completion
 
-have iftop || return
-
 _iftop()
 {
     local cur prev words cword
diff --git a/completions/ifupdown b/completions/ifupdown
index 776279c4..aab9bbca 100644
--- a/completions/ifupdown
+++ b/completions/ifupdown
@@ -1,6 +1,6 @@
 # Red Hat & Debian GNU/Linux if{up,down} completion
 #
-[ $USERLAND = GNU ] && have ifup || have ifdown || return
+[ $USERLAND = GNU ] || return 1
 
 _ifupdown()
 {
@@ -14,9 +14,7 @@ _ifupdown()
 
     return 0
 } &&
-complete -F _ifupdown ifup ifdown
-
-have ifstatus && complete -F _ifupdown ifstatus
+complete -F _ifupdown ifup ifdown ifstatus
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/imagemagick b/completions/imagemagick
index 160d7c24..31792c3e 100644
--- a/completions/imagemagick
+++ b/completions/imagemagick
@@ -1,7 +1,5 @@
 # bash completion for ImageMagick
 
-have convert || return
-
 _ImageMagick()
 {
     case $prev in
diff --git a/completions/info b/completions/info
index 432e57e7..962dec94 100644
--- a/completions/info
+++ b/completions/info
@@ -1,7 +1,5 @@
 # bash completion for info
 
-have info || have pinfo || return
-
 _info()
 {
     local cur prev words cword split
diff --git a/completions/ipmitool b/completions/ipmitool
index 5888f16e..6a1911b2 100644
--- a/completions/ipmitool
+++ b/completions/ipmitool
@@ -1,7 +1,5 @@
 # bash completion for ipmitool
 
-have ipmitool || return
-
 _ipmitool_singleline_help()
 {
     COMPREPLY=( $( compgen -W "$( $1 $2 2>&1 | \
diff --git a/completions/iproute2 b/completions/iproute2
index c699a3f8..7ef48325 100644
--- a/completions/iproute2
+++ b/completions/iproute2
@@ -1,7 +1,5 @@
 # iproute2 tools completion
 
-have ip || return
-
 _ip()
 {
     local cur prev words cword
diff --git a/completions/ipsec b/completions/ipsec
index 677e1e0e..d24e80b8 100644
--- a/completions/ipsec
+++ b/completions/ipsec
@@ -1,6 +1,5 @@
 # Linux ipsec(8) completion (for FreeS/WAN and strongSwan)
 #
-have ipsec || return
 
 # Complete ipsec.conf conn entries.
 #
@@ -98,7 +97,7 @@ _ipsec_strongswan()
     return 0
 }
 
-case "$( ipsec --version )" in
+case "$( ipsec --version 2>/dev/null )" in
     *strongSwan*)
         complete -F _ipsec_strongswan ipsec
         ;;
diff --git a/completions/iptables b/completions/iptables
index ea52983f..c554a26b 100644
--- a/completions/iptables
+++ b/completions/iptables
@@ -1,7 +1,5 @@
 # bash completion for iptables
 
-have iptables || return
-
 _iptables()
 {
     local cur prev words cword split
diff --git a/completions/iputils b/completions/iputils
index 236cf878..04d6b605 100644
--- a/completions/iputils
+++ b/completions/iputils
@@ -1,4 +1,3 @@
-have ping || have ping6 &&
 _ping()
 {
     local cur prev words cword
@@ -58,7 +57,6 @@ _ping()
 complete -F _ping ping ping6
 
 
-have tracepath || have tracepath6 &&
 _tracepath()
 {
     local cur prev words cword
@@ -80,7 +78,6 @@ _tracepath()
 complete -F _tracepath tracepath tracepath6
 
 
-have arping &&
 _arping()
 {
     local cur prev words cword
diff --git a/completions/ipv6calc b/completions/ipv6calc
index 9332475a..6aa4a55a 100644
--- a/completions/ipv6calc
+++ b/completions/ipv6calc
@@ -1,5 +1,3 @@
-have ipv6calc || return
-
 _ipv6calc()
 {
     local cur prev words cword split
diff --git a/completions/isql b/completions/isql
index 59c393b3..1e79b55d 100644
--- a/completions/isql
+++ b/completions/isql
@@ -1,7 +1,5 @@
 # isql completion by Victor Bogado da Silva Lins <victor@bogado.net>
 
-have isql || return
-
 _isql()
 {
     local cur prev words cword
diff --git a/completions/jar b/completions/jar
index 9d199c04..84d3e30e 100644
--- a/completions/jar
+++ b/completions/jar
@@ -1,7 +1,5 @@
 # jar(1) completion
 
-have jar || return
-
 _jar()
 {
     local cur prev words cword
diff --git a/completions/java b/completions/java
index 0d51f563..55ea57a4 100644
--- a/completions/java
+++ b/completions/java
@@ -1,14 +1,12 @@
 # bash completion for java, javac and javadoc
 
 # available path elements completion
-have java || have javac || have javadoc &&
 _java_path()
 {
     cur=${cur##*:}
     _filedir '@(jar|zip)'
 }
 
-have java || have javadoc && {
 # exact classpath determination
 _java_find_classpath()
 {
@@ -115,11 +113,9 @@ _java_packages()
     # convert path syntax to package syntax
     cur=${COMPREPLY[@]//\//.}
 }
-}
 
 # java completion
 #
-have java &&
 _java()
 {
     local cur prev words cword
@@ -234,7 +230,6 @@ _java()
 } &&
 complete -F _java java
 
-have javadoc &&
 _javadoc()
 {
     local cur prev words cword
@@ -276,7 +271,6 @@ _javadoc()
 } &&
 complete -F _javadoc javadoc
 
-have javac &&
 _javac()
 {
     local cur prev words cword
@@ -321,7 +315,6 @@ _javac()
 } &&
 complete -F _javac javac
 
-have pack200 &&
 _pack200()
 {
     local cur prev words cword split
@@ -394,7 +387,6 @@ _pack200()
 } &&
 complete -F _pack200 pack200
 
-have unpack200 &&
 _unpack200()
 {
     local cur prev words cword split
@@ -440,7 +432,6 @@ _unpack200()
 } &&
 complete -F _unpack200 unpack200
 
-have jarsigner &&
 _jarsigner()
 {
     local cur prev words cword
@@ -494,7 +485,6 @@ _jarsigner()
 } &&
 complete -F _jarsigner jarsigner
 
-have javaws &&
 _javaws()
 {
     local cur prev words cword
@@ -526,7 +516,6 @@ _javaws()
 } &&
 complete -F _javaws javaws
 
-have jps &&
 _jps()
 {
     local cur prev words cword
diff --git a/completions/k3b b/completions/k3b
index 9f41ed5c..94a75c33 100644
--- a/completions/k3b
+++ b/completions/k3b
@@ -1,7 +1,5 @@
 # bash completion for k3b
 
-have k3b || return
-
 _k3b()
 {
     local cur prev words cword
diff --git a/completions/kcov b/completions/kcov
index de421ff9..737b7b0f 100644
--- a/completions/kcov
+++ b/completions/kcov
@@ -1,5 +1,3 @@
-have kcov || return
-
 _kcov()
 {
     local cur prev words cword split
diff --git a/completions/kldload b/completions/kldload
index 16373160..d8249539 100644
--- a/completions/kldload
+++ b/completions/kldload
@@ -1,6 +1,6 @@
 # bash completion for FreeBSD kernel module commands
 
-[ $UNAME = FreeBSD ] || return
+[ $UNAME = FreeBSD ] || return 1
 
 _kldload()
 {
diff --git a/completions/larch b/completions/larch
index 081e18b0..84272995 100644
--- a/completions/larch
+++ b/completions/larch
@@ -1,7 +1,5 @@
 # larch(1) completion by Alex Shinn <foof@synthcode.com>
 
-have larch || return
-
 _larch()
 {
     local cur prev words cword
diff --git a/completions/ldapvi b/completions/ldapvi
index 124a3496..ea77e10d 100644
--- a/completions/ldapvi
+++ b/completions/ldapvi
@@ -1,7 +1,5 @@
 # bash completion for ldapvi
 
-have ldapvi || return
-
 _ldapvi()
 {
     local cur prev words cword
diff --git a/completions/lftp b/completions/lftp
index 18944bc1..984a67e8 100644
--- a/completions/lftp
+++ b/completions/lftp
@@ -1,6 +1,5 @@
 # bash completion for lftp
 
-have lftp &&
 _lftp()
 {
     local cur prev words cword
@@ -27,7 +26,6 @@ _lftp()
 } &&
 complete -F _lftp lftp
 
-have lftpget &&
 _lftpget()
 {
     local cur prev words cword
diff --git a/completions/lilo b/completions/lilo
index ad8b2da5..712268d4 100644
--- a/completions/lilo
+++ b/completions/lilo
@@ -1,7 +1,5 @@
 # bash completion for lilo(8)
 
-have lilo || return
-
 _lilo_labels()
 {
     COMPREPLY=( $( compgen -W "$( awk -F'=' '/label/ {print $2}' \
diff --git a/completions/links b/completions/links
index 09a6193d..822fe439 100644
--- a/completions/links
+++ b/completions/links
@@ -1,7 +1,5 @@
 # bash completion for links
 
-have links || return
-
 _links()
 {
     local cur prev words cword
diff --git a/completions/lintian b/completions/lintian
index b2467212..59af7a0a 100644
--- a/completions/lintian
+++ b/completions/lintian
@@ -3,8 +3,6 @@
 #
 # bash completion for lintian(1) and lintian-info(1)
 
-have lintian || return
-
 _lintian_tags()
 {
     local match search tags
diff --git a/completions/lisp b/completions/lisp
index 78054e09..cb1f899d 100644
--- a/completions/lisp
+++ b/completions/lisp
@@ -1,8 +1,6 @@
 # bash programmable completion for various Common Lisp implementations by
 # Nikodemus Siivola <nikodemus@random-state.net>
 
-have lisp || return
-
 _lisp()
 {
     local cur prev words cword
diff --git a/completions/lrzip b/completions/lrzip
index 3622271e..50af8b48 100644
--- a/completions/lrzip
+++ b/completions/lrzip
@@ -1,7 +1,5 @@
 # lrzip(1) completion
 
-have lrzip || return
-
 _lrzip()
 {
     local cur prev words cword
diff --git a/completions/lsof b/completions/lsof
index 1a28659a..a1e215bc 100644
--- a/completions/lsof
+++ b/completions/lsof
@@ -1,7 +1,5 @@
 # lsof(8) completion
 
-have lsof || return
-
 _lsof()
 {
     local cur prev words cword
diff --git a/completions/lvm b/completions/lvm
index 0d7a7f53..e8823913 100644
--- a/completions/lvm
+++ b/completions/lvm
@@ -1,7 +1,5 @@
 # bash completion for lvm
 
-have lvm || return
-
 _volumegroups()
 {
     COMPREPLY=( $(compgen -W "$( vgscan 2>/dev/null | \
diff --git a/completions/lzma b/completions/lzma
index cb5b2ce4..415cf79c 100644
--- a/completions/lzma
+++ b/completions/lzma
@@ -1,7 +1,5 @@
 # lzma(1) completion by Per Øyvind Karlsen <peroyvind@mandriva.org>
 
-have lzma || return
-
 _lzma()
 {
     local cur prev words cword
diff --git a/completions/lzop b/completions/lzop
index 97ca9901..41091d77 100644
--- a/completions/lzop
+++ b/completions/lzop
@@ -1,7 +1,5 @@
 # lzop(1) completion
 
-have lzop || return
-
 _lzop()
 {
     local cur prev words cword
diff --git a/completions/mailman b/completions/mailman
index 93f75fb1..ba1d08c7 100644
--- a/completions/mailman
+++ b/completions/mailman
@@ -1,6 +1,5 @@
 # mailman completion
 
-have list_lists && {
 _mailman_lists()
 {
     COMPREPLY=( $( compgen -W '$( list_lists -b )' -- "$cur" ) )
@@ -18,9 +17,7 @@ _list_lists()
 
 } &&
 complete -F _list_lists list_lists
-}
 
-have add_members &&
 _add_members()
 {
     local cur prev words cword split
@@ -50,7 +47,6 @@ _add_members()
 } &&
 complete -F _add_members add_members
 
-have remove_members &&
 _remove_members()
 {
     local cur prev words cword split
@@ -75,7 +71,6 @@ _remove_members()
 } &&
 complete -F _remove_members remove_members
 
-have find_member &&
 _find_member()
 {
     local cur prev words cword split
@@ -98,7 +93,6 @@ _find_member()
 } &&
 complete -F _find_member find_member
 
-have clone_member &&
 _clone_member()
 {
     local cur prev words cword split
@@ -121,7 +115,6 @@ _clone_member()
 } &&
 complete -F _clone_member clone_member
 
-have sync_members &&
 _sync_members()
 {
     local cur prev words cword split
@@ -150,7 +143,6 @@ _sync_members()
 } &&
 complete -F _sync_members sync_members
 
-have unshunt &&
 _unshunt()
 {
     local cur prev words cword
@@ -165,7 +157,6 @@ _unshunt()
 } &&
 complete -F _unshunt unshunt
 
-have list_admins &&
 _list_admins()
 {
     local cur prev words cword
@@ -180,7 +171,6 @@ _list_admins()
 } &&
 complete -F _list_admins list_admins
 
-have list_owners &&
 _list_owners()
 {
     local cur prev words cword
@@ -196,7 +186,6 @@ _list_owners()
 } &&
 complete -F _list_owners list_owners
 
-have list_members &&
 _list_members()
 {
     local cur prev words cword split
@@ -230,7 +219,6 @@ _list_members()
 } &&
 complete -F _list_members list_members
 
-have change_pw &&
 _change_pw()
 {
     local cur prev words cword split
@@ -253,7 +241,6 @@ _change_pw()
 } &&
 complete -F _change_pw change_pw
 
-have withlist &&
 _withlist()
 {
     local cur prev words cword
@@ -269,7 +256,6 @@ _withlist()
 } &&
 complete -F _withlist withlist
 
-have newlist &&
 _newlist()
 {
     local cur prev words cword
@@ -284,7 +270,6 @@ _newlist()
 } &&
 complete -F _newlist newlist
 
-have rmlist &&
 _rmlist()
 {
     local cur prev words cword
@@ -299,7 +284,6 @@ _rmlist()
 } &&
 complete -F _rmlist rmlist
 
-have config_list &&
 _config_list()
 {
     local cur prev words cword split
@@ -326,7 +310,7 @@ complete -F _config_list config_list
 
 # Try to detect whether this is the mailman "arch" to avoid installing
 # it for the coreutils/util-linux-ng one.
-have arch && have mailmanctl &&
+_have arch && _have mailmanctl &&
 _arch()
 {
     local cur prev words cword split
@@ -368,7 +352,6 @@ _arch()
 } &&
 complete -F _arch arch
 
-have cleanarch &&
 _cleanarch()
 {
     local cur prev words cword
@@ -382,7 +365,6 @@ _cleanarch()
 } &&
 complete -F _cleanarch cleanarch
 
-have inject &&
 _inject()
 {
     local cur prev words cword split
@@ -406,7 +388,6 @@ _inject()
 } &&
 complete -F _inject inject
 
-have dumpdb &&
 _dumpdb()
 {
     local cur prev words cword
@@ -422,7 +403,6 @@ _dumpdb()
 } &&
 complete -F _dumpdb dumpdb
 
-have check_db &&
 _check_db()
 {
     local cur prev words cword
@@ -437,7 +417,6 @@ _check_db()
 } &&
 complete -F _check_db check_db
 
-have check_perms &&
 _check_perms()
 {
     local cur prev words cword
@@ -450,7 +429,6 @@ _check_perms()
 } &&
 complete -F _check_perms check_perms
 
-have genaliases &&
 _genaliases()
 {
     local cur prev words cword
@@ -463,7 +441,6 @@ _genaliases()
 } &&
 complete -F _genaliases genaliases
 
-have mmsitepass &&
 _mmsitepass()
 {
     local cur prev words cword
@@ -476,7 +453,6 @@ _mmsitepass()
 } &&
 complete -F _mmsitepass mmsitepass
 
-have qrunner &&
 _qrunner()
 {
     local cur prev words cword split
@@ -492,7 +468,6 @@ _qrunner()
 } &&
 complete -F _qrunner qrunner
 
-have mailmanctl &&
 _mailmanctl()
 {
     local cur prev words cword
diff --git a/completions/make b/completions/make
index 12dfad47..c2b73145 100644
--- a/completions/make
+++ b/completions/make
@@ -1,7 +1,5 @@
 # bash completion for GNU make
 
-have make || have gmake || have gnumake || have pmake || return
-
 _make()
 {
     local cur prev words cword split
diff --git a/completions/mc b/completions/mc
index 27ddc0a0..8444e522 100644
--- a/completions/mc
+++ b/completions/mc
@@ -1,7 +1,5 @@
 # bash completion for mc
 
-have mc || return
-
 _mc()
 {
     local cur prev words cword split
diff --git a/completions/mcrypt b/completions/mcrypt
index d205dba4..824907ed 100644
--- a/completions/mcrypt
+++ b/completions/mcrypt
@@ -1,7 +1,5 @@
 # mcrypt(1) completion by Ariel Fermani <the_end@bbs.frc.utn.edu.ar>
 
-have mcrypt || have mdecrypt || return
-
 _mcrypt()
 {
     local cur prev words cword
diff --git a/completions/mdadm b/completions/mdadm
index 19647e08..d36e20b0 100644
--- a/completions/mdadm
+++ b/completions/mdadm
@@ -1,7 +1,5 @@
 # bash completion for mdadm
 
-have mdadm || return
-
 _mdadm_raid_level()
 {
     local mode
diff --git a/completions/medusa b/completions/medusa
index f0d538e5..a9837afa 100644
--- a/completions/medusa
+++ b/completions/medusa
@@ -1,7 +1,5 @@
 # bash completion for medusa
 
-have medusa || return
-
 _medusa()
 {
     local cur prev words cword
diff --git a/completions/minicom b/completions/minicom
index 2daaf00b..fd9c0c5b 100644
--- a/completions/minicom
+++ b/completions/minicom
@@ -1,7 +1,5 @@
 # bash completion for minicom
 
-have minicom || return
-
 _minicom()
 {
     local cur prev words cword
diff --git a/completions/mkinitrd b/completions/mkinitrd
index 9efdf8e5..122ff001 100644
--- a/completions/mkinitrd
+++ b/completions/mkinitrd
@@ -1,7 +1,5 @@
 # bash completion for mkinitrd
 
-have mkinitrd || return
-
 _mkinitrd()
 {
     local cur prev words cword split
diff --git a/completions/module-init-tools b/completions/module-init-tools
index 9d24d16f..44dee0a9 100644
--- a/completions/module-init-tools
+++ b/completions/module-init-tools
@@ -3,7 +3,6 @@
 # Linux rmmod(8) completion. This completes on a list of all currently
 # installed kernel modules.
 #
-have rmmod &&
 _rmmod()
 {
     local cur prev words cword
@@ -18,7 +17,6 @@ complete -F _rmmod rmmod
 # list of all available modules for the version of the kernel currently
 # running.
 #
-have insmod || have modprobe || have modinfo &&
 _insmod()
 {
     local cur prev words cword
diff --git a/completions/monodevelop b/completions/monodevelop
index bb7aa645..ca035699 100644
--- a/completions/monodevelop
+++ b/completions/monodevelop
@@ -1,6 +1,5 @@
 # Monodevelop completion
 
-have monodevelop &&
 _monodevelop()
 {
     local cur prev words cword split
@@ -18,7 +17,6 @@ _monodevelop()
 } &&
 complete -F _monodevelop monodevelop
 
-have mdtool &&
 _mdtool()
 {
     local cur prev words cword
diff --git a/completions/mount b/completions/mount
index ccff0187..25f58f10 100644
--- a/completions/mount
+++ b/completions/mount
@@ -4,7 +4,6 @@
 # query the server for a list of all available exports and complete on
 # that instead.
 #
-have mount || return
 
 # Just like COMPREPLY=(`compgen -W "${COMPREPLY[*]}" -- "$cur"`), only better!
 #
@@ -133,7 +132,6 @@ complete -F _mount -o default -o dirnames mount
 # umount(8) completion. This relies on the mount point being the third
 # space-delimited field in the output of mount(8)
 #
-have umount &&
 _umount()
 {
     local cur prev words cword
diff --git a/completions/mplayer b/completions/mplayer
index 98908c05..278d1c55 100644
--- a/completions/mplayer
+++ b/completions/mplayer
@@ -1,7 +1,5 @@
 # mplayer(1) completion
 
-have mplayer || have mplayer2 || have mencoder || return
-
 _mplayer_options_list()
 {
     cur=${cur%\\}
diff --git a/completions/msynctool b/completions/msynctool
index 3afab814..161d6072 100644
--- a/completions/msynctool
+++ b/completions/msynctool
@@ -1,7 +1,5 @@
 # bash completion for msynctool
 
-have msynctool || return
-
 _msynctool()
 {
     local cur prev words cword
diff --git a/completions/mtx b/completions/mtx
index e119b80c..7a0ea98f 100644
--- a/completions/mtx
+++ b/completions/mtx
@@ -1,7 +1,5 @@
 # mtx completion by Jon Middleton <jjm@ixtab.org.uk>
 
-have mtx || return
-
 _mtx()
 {
     local cur prev words cword
diff --git a/completions/munin-node b/completions/munin-node
index c7af5bd3..5d69dd71 100644
--- a/completions/munin-node
+++ b/completions/munin-node
@@ -1,6 +1,5 @@
 # bash completion for munin node
 
-have munin-run &&
 _munin_run()
 {
     local cur prev words cword
@@ -26,7 +25,6 @@ _munin_run()
 } &&
 complete -F _munin_run munin-run
 
-have munindoc &&
 _munindoc()
 {
     local cur prev words cword
@@ -37,7 +35,6 @@ _munindoc()
 } &&
 complete -F _munindoc munindoc
 
-have munin-update &&
 _munin_update()
 {
     local cur prev words cword
@@ -62,7 +59,6 @@ _munin_update()
 } &&
 complete -F _munin_update munin-update
 
-have munin-node-configure &&
 _munin_node_configure()
 {
     local cur prev words cword
diff --git a/completions/mutt b/completions/mutt
index c5d5d1f6..6e2447fd 100644
--- a/completions/mutt
+++ b/completions/mutt
@@ -3,8 +3,6 @@
 # Mutt doesn't have an "addressbook" like Pine, but it has aliases and
 # a "query" function to retrieve addresses, so that's what we use here.
 
-have mutt || have muttng || return
-
 # @param $1 (cur) Current word to complete
 _muttaddr()
 {
diff --git a/completions/mysql b/completions/mysql
index b2c69d94..24fc7da4 100644
--- a/completions/mysql
+++ b/completions/mysql
@@ -1,7 +1,5 @@
 # mysql(1) completion
 
-have mysql || return
-
 _mysql()
 {
     local cur prev words cword split
diff --git a/completions/mysqladmin b/completions/mysqladmin
index b14a90bb..d79460b8 100644
--- a/completions/mysqladmin
+++ b/completions/mysqladmin
@@ -1,7 +1,5 @@
 # bash completion for mysqladmin
 
-have mysqladmin || return
-
 _mysqladmin()
 {
     local cur prev words cword split
diff --git a/completions/ncftp b/completions/ncftp
index 9492efcc..58c7b7fc 100644
--- a/completions/ncftp
+++ b/completions/ncftp
@@ -1,7 +1,5 @@
 # bash completion for ncftp
 
-have ncftp || return
-
 _ncftp()
 {
     local cur prev words cword
diff --git a/completions/net-tools b/completions/net-tools
index 97297b19..0019ce77 100644
--- a/completions/net-tools
+++ b/completions/net-tools
@@ -1,6 +1,5 @@
 # bash completion for net tools
 
-have mii-tool &&
 _mii_tool()
 {
     local cur prev words cword split
@@ -30,7 +29,6 @@ _mii_tool()
 } &&
 complete -F _mii_tool -o default mii-tool
 
-have mii-diag &&
 _mii_diag()
 {
     local cur prev words cword split
@@ -57,7 +55,7 @@ complete -F _mii_diag -o default mii-diag
 
 # Linux route(8) completion
 #
-[ $UNAME = Linux ] && have route &&
+[ $UNAME = Linux ] &&
 _route()
 {
     local cur prev words cword
@@ -83,7 +81,6 @@ _route()
 } &&
 complete -F _route route
 
-have ether-wake &&
 _ether_wake()
 {
     local cur prev words cword
diff --git a/completions/nmap b/completions/nmap
index 2c28af18..4dcbfbc7 100644
--- a/completions/nmap
+++ b/completions/nmap
@@ -1,7 +1,5 @@
 # bash completion for nmap
 
-have nmap || return
-
 _nmap()
 {
     local cur prev words cword
diff --git a/completions/ntpdate b/completions/ntpdate
index 0d18f102..fd9db951 100644
--- a/completions/ntpdate
+++ b/completions/ntpdate
@@ -1,7 +1,5 @@
 # bash completion for ntpdate
 
-have ntpdate || return
-
 _ntpdate()
 {
     local cur prev words cword
diff --git a/completions/open-iscsi b/completions/open-iscsi
index 6a954d86..46170635 100644
--- a/completions/open-iscsi
+++ b/completions/open-iscsi
@@ -1,7 +1,5 @@
 # iscsiadm(1) completion
 
-have iscsiadm || return
-
 _iscsiadm()
 {
     local cur prev words cword split
diff --git a/completions/openldap b/completions/openldap
index 9520a5e2..7bdf29f4 100644
--- a/completions/openldap
+++ b/completions/openldap
@@ -1,7 +1,5 @@
 # bash completion for openldap
 
-have ldapsearch || return
-
 _ldap_uris()
 {
     COMPREPLY=( $( compgen -W 'ldap:// ldaps://' -- "$cur" ) )
diff --git a/completions/openssl b/completions/openssl
index 68eaa167..b3573877 100644
--- a/completions/openssl
+++ b/completions/openssl
@@ -1,7 +1,5 @@
 # bash completion for openssl
 
-have openssl || return
-
 _openssl_sections()
 {
     local config f
diff --git a/completions/p4 b/completions/p4
index d18b679d..3fa868cd 100644
--- a/completions/p4
+++ b/completions/p4
@@ -1,7 +1,5 @@
 # Perforce completion by Frank Cusack <frank@google.com>
 
-have p4 || return
-
 _p4()
 {
     local cur prev words cword
diff --git a/completions/perl b/completions/perl
index eeea0eb2..4ec55a2b 100644
--- a/completions/perl
+++ b/completions/perl
@@ -1,7 +1,5 @@
 # bash completion for perl
 
-have perl || return
-
 _perlmodules()
 {
     COMPREPLY=( $( compgen -P "$prefix" -W \
diff --git a/completions/pine b/completions/pine
index a8f15736..e37cbd9c 100644
--- a/completions/pine
+++ b/completions/pine
@@ -1,7 +1,5 @@
 # PINE address-book completion
 
-have pine || have alpine || return
-
 _pineaddr()
 {
     local cur prev words cword
diff --git a/completions/pkg-config b/completions/pkg-config
index b30fa557..aa89eed8 100644
--- a/completions/pkg-config
+++ b/completions/pkg-config
@@ -1,7 +1,5 @@
 # bash completion for pkgconfig
 
-have pkg-config || return
-
 _pkg_config()
 {
     local cur prev words cword split
diff --git a/completions/pkg_install b/completions/pkg_install
index 52545557..522d3f42 100644
--- a/completions/pkg_install
+++ b/completions/pkg_install
@@ -1,6 +1,6 @@
 # bash completion for FreeBSD base package management tools
 
-[ $UNAME = FreeBSD ] || return
+[ $UNAME = FreeBSD ] || return 1
 
 _pkg_delete()
 {
@@ -16,7 +16,7 @@ _pkg_delete()
 
     return 0
 } &&
-complete -F _pkg_delete -o dirnames pkg_delete pkg_info
+complete -F _pkg_delete -o dirnames pkg_delete pkg_info pkg_deinstall
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/pkgtools b/completions/pkgtools
index e760f8ff..2c8e2ed7 100644
--- a/completions/pkgtools
+++ b/completions/pkgtools
@@ -1,9 +1,7 @@
 # bash completion for Slackware Linux pkgtools
 
-[ -f /etc/slackware-version ] || return
+[ -f /etc/slackware-version ] || return 1
 
-
-have pkgtool &&
 _pkgtool()
 {
     local cur prev words cword
@@ -37,7 +35,6 @@ _pkgtool()
 } &&
 complete -F _pkgtool pkgtool
 
-have removepkg &&
 _removepkg()
 {
     local cur prev words cword
@@ -54,7 +51,6 @@ _removepkg()
 } &&
 complete -F _removepkg removepkg
 
-have upgradepkg &&
 _upgradepkg()
 {
     local cur prev words cword
@@ -69,7 +65,6 @@ _upgradepkg()
     _filedir "t[bglx]z"
 } && complete -F _upgradepkg upgradepkg
 
-have installpkg &&
 _installpkg()
 {
     local cur prev words cword
@@ -99,7 +94,6 @@ _installpkg()
     _filedir "t[bglx]z"
 } && complete -F _installpkg installpkg
 
-have makepkg &&
 _makepkg()
 {
     local cur prev words cword
@@ -121,7 +115,6 @@ _makepkg()
     _filedir
 } && complete -F _makepkg makepkg
 
-have explodepkg &&
 complete -o plusdirs -f -X '!*.t[bglx]z' explodepkg
 
 # Local variables:
diff --git a/completions/pm-utils b/completions/pm-utils
index 3d4f2fe8..1396025e 100644
--- a/completions/pm-utils
+++ b/completions/pm-utils
@@ -1,6 +1,5 @@
 # bash completion for pm-utils
 
-have pm-is-supported &&
 _pm_is_supported()
 {
     local cur prev words cword
@@ -11,7 +10,6 @@ _pm_is_supported()
 } &&
 complete -F _pm_is_supported pm-is-supported
 
-have pm-hibernate || have pm-suspend || have pm-suspend-hybrid &&
 _pm_action()
 {
     local cur prev words cword
@@ -21,7 +19,6 @@ _pm_action()
 } &&
 complete -F _pm_action pm-hibernate pm-suspend pm-suspend-hybrid
 
-have pm-powersave &&
 _pm_powersave()
 {
     local cur prev words cword
diff --git a/completions/portupgrade b/completions/portupgrade
index 0e8a20b3..230d6364 100644
--- a/completions/portupgrade
+++ b/completions/portupgrade
@@ -1,6 +1,5 @@
 # bash completion for FreeBSD portupgrade package
 
-have portupgrade &&
 _portupgrade()
 {
     local cur prev words cword
@@ -18,7 +17,6 @@ _portupgrade()
 } &&
 complete -F _portupgrade -o dirnames portupgrade
 
-have portinstall &&
 _portinstall()
 {
     local cur prev words cword
@@ -47,10 +45,6 @@ _portinstall()
 } &&
 complete -F _portinstall -o dirnames portinstall
 
-# _pkg_delete is in pkg_install
-declare -F _pkg_delete &>/dev/null && have pkg_deinstall && \
-complete -F _pkg_delete -o dirnames pkg_deinstall
-
 # Local variables:
 # mode: shell-script
 # sh-basic-offset: 4
diff --git a/completions/postfix b/completions/postfix
index b950b1d4..915ab385 100644
--- a/completions/postfix
+++ b/completions/postfix
@@ -1,7 +1,5 @@
 # bash completion for postfix
 
-have postfix || return
-
 # postfix(1)
 #
 _postfix()
diff --git a/completions/postgresql b/completions/postgresql
index e3c3d122..6aeaf50c 100644
--- a/completions/postgresql
+++ b/completions/postgresql
@@ -1,7 +1,5 @@
 # bash completion for Postgresql
 
-have psql || return
-
 _pg_databases()
 {
     # -w was introduced in 8.4, https://launchpad.net/bugs/164772
diff --git a/completions/povray b/completions/povray
index c663ed08..0a853550 100644
--- a/completions/povray
+++ b/completions/povray
@@ -1,7 +1,5 @@
 # povray completion by "David Necas (Yeti)" <yeti@physics.muni.cz>
 
-have povray || have xpovray || have spovray || return
-
 _povray()
 {
     local cur prev words cword
diff --git a/completions/prelink b/completions/prelink
index 017d543a..ade3258d 100644
--- a/completions/prelink
+++ b/completions/prelink
@@ -1,5 +1,3 @@
-have prelink || return
-
 _prelink()
 {
     local cur prev words cword split
diff --git a/completions/procps b/completions/procps
index b12b936e..bd02be99 100644
--- a/completions/procps
+++ b/completions/procps
@@ -2,7 +2,6 @@
 
 # killall(1) (Linux, FreeBSD and Darwin) and pkill(1) completion.
 #
-[[ $UNAME == @(Linux|FreeBSD|Darwin) ]] || have pkill &&
 _killall()
 {
     local cur prev words cword
@@ -15,13 +14,12 @@ _killall()
     fi
 
     return 0
-}
+} &&
+complete -F _killall pkill
 [[ $UNAME == @(Linux|FreeBSD|Darwin) ]] && complete -F _killall killall
-have pkill && complete -F _killall pkill
 
 # pgrep(1) completion.
 #
-[ $UNAME = Linux ] || have pgrep &&
 _pgrep()
 {
     local cur prev words cword
@@ -51,13 +49,12 @@ _pgrep()
     fi
 
     _pnames
-}
-have pgrep && complete -F _pgrep pgrep
+} &&
+complete -F _pgrep pgrep
 
 # Linux pidof(8) completion.
 [ $UNAME = Linux ] && complete -F _pgrep pidof
 
-have pwdx &&
 _pwdx()
 {
     local cur prev words cword
@@ -73,7 +70,7 @@ _pwdx()
 } &&
 complete -F _pwdx pwdx
 
-[[ $UNAME == Linux ]] && have watch &&
+[[ $UNAME == Linux ]] &&
 _watch()
 {
     local cur prev words cword split
diff --git a/completions/protoc b/completions/protoc
index 26a10961..2ebae940 100644
--- a/completions/protoc
+++ b/completions/protoc
@@ -1,5 +1,3 @@
-have protoc || return
-
 _protoc()
 {
     local cur prev words cword split
diff --git a/completions/puppet b/completions/puppet
index fe4a3d32..489a85d9 100644
--- a/completions/puppet
+++ b/completions/puppet
@@ -1,8 +1,5 @@
 # bash completion for puppet
 
-have puppetmasterd || have puppetd || have puppetca || have ralsh || \
-have puppetrun || have puppetqd || have filebucket || have puppetdoc || return
-
 _puppet_logdest()
 {
     if [ -z "$cur" ]; then
diff --git a/completions/pwgen b/completions/pwgen
index 40bf376e..29bfb442 100644
--- a/completions/pwgen
+++ b/completions/pwgen
@@ -1,5 +1,3 @@
-have pwgen || return
-
 _pwgen()
 {
     local cur prev words cword split
diff --git a/completions/python b/completions/python
index fb5f71aa..86285f43 100644
--- a/completions/python
+++ b/completions/python
@@ -1,7 +1,5 @@
 # bash completion for python
 
-have python || return
-
 _python()
 {
     local cur prev words cword
diff --git a/completions/qdbus b/completions/qdbus
index ffdea33b..e4fa968e 100644
--- a/completions/qdbus
+++ b/completions/qdbus
@@ -1,7 +1,5 @@
 # Qt qdbus, dcop completion
 
-have qdbus || have dcop || return
-
 _qdbus()
 {
     local cur prev words cword
diff --git a/completions/qemu b/completions/qemu
index 1e314848..320c3010 100644
--- a/completions/qemu
+++ b/completions/qemu
@@ -1,7 +1,5 @@
 # bash completion for qemu
 
-have qemu || return
-
 _qemu()
 {
     local cur prev words cword
diff --git a/completions/quota-tools b/completions/quota-tools
index e6cba919..b95c386a 100644
--- a/completions/quota-tools
+++ b/completions/quota-tools
@@ -1,7 +1,5 @@
 # bash completion for quota-tools
 
-have quota || return
-
 _user_or_group()
 {
     local i
diff --git a/completions/rcs b/completions/rcs
index 9b150109..f29d2e46 100644
--- a/completions/rcs
+++ b/completions/rcs
@@ -1,7 +1,5 @@
 # bash completion for rcs
 
-have rcs || return
-
 _rcs()
 {
     local cur prev words cword
diff --git a/completions/rdesktop b/completions/rdesktop
index 20f3b482..b4b14dd9 100644
--- a/completions/rdesktop
+++ b/completions/rdesktop
@@ -1,7 +1,5 @@
 # bash completion for rdesktop
 
-have rdesktop || return
-
 _rdesktop()
 {
     local cur prev words cword
diff --git a/completions/reportbug b/completions/reportbug
index 7daa3180..6a72d366 100644
--- a/completions/reportbug
+++ b/completions/reportbug
@@ -1,6 +1,5 @@
 # bash completion for (Debian) reportbug package
 
-have reportbug &&
 _reportbug()
 {
     local cur prev words cword
@@ -84,7 +83,6 @@ _reportbug()
 } &&
 complete -F _reportbug reportbug
 
-have querybts &&
 _querybts()
 {
     local cur prev words cword split
diff --git a/completions/reptyr b/completions/reptyr
index 527735bb..1bc4a447 100644
--- a/completions/reptyr
+++ b/completions/reptyr
@@ -1,7 +1,5 @@
 # bash completion for reptyr(1)
 
-have reptyr || return
-
 _reptyr()
 {
     local cur prev words cword
diff --git a/completions/resolvconf b/completions/resolvconf
index 83cbdb07..682d79ba 100644
--- a/completions/resolvconf
+++ b/completions/resolvconf
@@ -1,7 +1,5 @@
 # bash completion for resolvconf
 
-have resolvconf || return
-
 _resolvconf()
 {
     local cur prev words cword
diff --git a/completions/rfkill b/completions/rfkill
index f0d4f1cc..c03f488a 100644
--- a/completions/rfkill
+++ b/completions/rfkill
@@ -1,7 +1,5 @@
 # bash completion for rfkill
 
-have rfkill || return
-
 _rfkill()
 {
     local cur prev words cword
diff --git a/completions/ri b/completions/ri
index f0658d7f..40ce9727 100644
--- a/completions/ri
+++ b/completions/ri
@@ -1,7 +1,5 @@
 # ri completion for Ruby documentation by Ian Macdonald <ian@caliban.org>
 
-have ri || return
-
 ri_get_methods()
 {
     local regex
diff --git a/completions/rpcdebug b/completions/rpcdebug
index ef9eabf1..22830b16 100644
--- a/completions/rpcdebug
+++ b/completions/rpcdebug
@@ -1,7 +1,5 @@
 # bash completion for rpcdebug
 
-have rpcdebug || return
-
 _rpcdebug_flags()
 {
 
diff --git a/completions/rpm b/completions/rpm
index 883e8631..739d7dbc 100644
--- a/completions/rpm
+++ b/completions/rpm
@@ -1,6 +1,5 @@
 # bash completion for rpm
 
-have rpm && {
 # helper functions
 
 _rpm_installed_packages()
@@ -302,9 +301,7 @@ _rpmbuild()
     [[ -n $ext ]] && _filedir $ext
 } &&
 complete -F _rpmbuild rpmbuild rpmbuild-md5
-}
 
-have gendiff &&
 _gendiff()
 {
     local cur prev words cword
diff --git a/completions/rpm2tgz b/completions/rpm2tgz
index 556060ad..7dc73d7c 100644
--- a/completions/rpm2tgz
+++ b/completions/rpm2tgz
@@ -1,7 +1,5 @@
 # Slackware rpm2tgz completion.
 
-have rpm2tgz || return
-
 _rpm2tgz()
 {
     local cur prev words cword
diff --git a/completions/rpmcheck b/completions/rpmcheck
index 55db88c4..8bbc46a3 100644
--- a/completions/rpmcheck
+++ b/completions/rpmcheck
@@ -1,7 +1,5 @@
 # bash completion for rpmcheck
 
-have rpmcheck || return
-
 _rpmcheck()
 {
     local cur prev words cword
diff --git a/completions/rrdtool b/completions/rrdtool
index aec5dbb5..909d2f4d 100644
--- a/completions/rrdtool
+++ b/completions/rrdtool
@@ -1,7 +1,5 @@
 # bash completion for rrdtool
 
-have rrdtool || return
-
 _rrdtool ()
 {
     local cur prev words cword
diff --git a/completions/rsync b/completions/rsync
index 5a70bd47..3befcb8a 100644
--- a/completions/rsync
+++ b/completions/rsync
@@ -1,7 +1,5 @@
 # bash completion for rsync
 
-have rsync || return
-
 _rsync()
 {
     local cur prev words cword split
diff --git a/completions/rtcwake b/completions/rtcwake
index 021dd21c..bc2bbf39 100644
--- a/completions/rtcwake
+++ b/completions/rtcwake
@@ -1,7 +1,5 @@
 # bash completion for rtcwake
 
-have rtcwake || return
-
 _rtcwake()
 {
     local cur prev words cword split
diff --git a/completions/samba b/completions/samba
index 4a947672..3f45ea79 100644
--- a/completions/samba
+++ b/completions/samba
@@ -1,7 +1,5 @@
 # bash completion for samba
 
-have smbclient || return
-
 _samba_resolve_order()
 {
     COMPREPLY=( $( compgen -W 'lmhosts host wins bcast' -- "$cur" ) )
diff --git a/completions/sbcl b/completions/sbcl
index 85d0b437..13282696 100644
--- a/completions/sbcl
+++ b/completions/sbcl
@@ -1,8 +1,6 @@
 # bash programmable completion for various Common Lisp implementations by
 # Nikodemus Siivola <nikodemus@random-state.net>
 
-have sbcl || have sbcl-mt || return
-
 _sbcl()
 {
     local cur prev words cword
diff --git a/completions/sbopkg b/completions/sbopkg
index cec466ec..d31d73b1 100644
--- a/completions/sbopkg
+++ b/completions/sbopkg
@@ -1,7 +1,5 @@
 # bash completion for sbopkg tool
 
-have sbopkg || return
-
 _sbopkg()
 {
     local cur prev words cword
diff --git a/completions/screen b/completions/screen
index 9e4b33cf..00e93f15 100644
--- a/completions/screen
+++ b/completions/screen
@@ -1,7 +1,5 @@
 # bash completion for screen
 
-have screen || return
-
 _screen_sessions()
 {
     local sessions=( $( command screen -ls | sed -ne \
diff --git a/completions/service b/completions/service
index 47fde5ad..51257ab0 100644
--- a/completions/service
+++ b/completions/service
@@ -4,8 +4,6 @@
 # 'service' command and/or the SysV init.d directory, followed by
 # that script's available commands
 
-[[ -d /etc/init.d || -d /etc/rc.d/init.d ]] || have service || return
-
 _service()
 {
     local cur prev words cword
diff --git a/completions/sh b/completions/sh
index 2ca56e8e..4728236d 100644
--- a/completions/sh
+++ b/completions/sh
@@ -1,7 +1,5 @@
 # POSIX sh(1) completion
 
-have sh || return
-
 _sh()
 {
     local cur prev words cword
diff --git a/completions/shadow b/completions/shadow
index b3c00d89..4b0f02c7 100644
--- a/completions/shadow
+++ b/completions/shadow
@@ -1,6 +1,5 @@
 # bash completion for shadow utils
 
-have useradd &&
 _useradd()
 {
     local cur prev words cword split
@@ -43,7 +42,6 @@ _useradd()
 } &&
 complete -F _useradd useradd
 
-have usermod &&
 _usermod()
 {
     local cur prev words cword split
@@ -85,7 +83,6 @@ _usermod()
 } &&
 complete -F _usermod usermod
 
-have userdel &&
 _userdel()
 {
     local cur prev words cword
@@ -100,7 +97,6 @@ _userdel()
 } &&
 complete -F _userdel userdel
 
-have chage &&
 _chage()
 {
     local cur prev words cword split
@@ -124,7 +120,6 @@ _chage()
 } &&
 complete -F _chage chage
 
-have passwd &&
 _passwd()
 {
     local cur prev words cword
@@ -145,7 +140,6 @@ _passwd()
 } &&
 complete -F _passwd passwd
 
-have chpasswd &&
 _chpasswd()
 {
     local cur prev words cword split
@@ -172,7 +166,6 @@ _chpasswd()
 } &&
 complete -F _chpasswd chpasswd
 
-have newusers &&
 _newusers()
 {
     local cur prev words cword split
@@ -201,7 +194,6 @@ _newusers()
 } &&
 complete -F _newusers newusers
 
-have pwck &&
 _pwck()
 {
     local cur prev words cword
@@ -216,7 +208,6 @@ _pwck()
 } &&
 complete -F _pwck pwck
 
-have groupadd &&
 _groupadd()
 {
     local cur prev words cword split
@@ -241,7 +232,6 @@ _groupadd()
 } &&
 complete -F _groupadd groupadd
 
-have groupmod &&
 _groupmod()
 {
     local cur prev words cword split
@@ -270,7 +260,6 @@ complete -F _groupmod groupmod
 
 complete -g groupdel
 
-have newgrp &&
 _newgrp()
 {
     local cur prev words cword
@@ -284,7 +273,6 @@ _newgrp()
 } &&
 complete -F _newgrp newgrp
 
-have gpasswd &&
 _gpasswd()
 {
     local cur prev words cword
@@ -307,7 +295,6 @@ _gpasswd()
 } &&
 complete -F _gpasswd gpasswd
 
-have groupmems &&
 _groupmems()
 {
     local cur prev words cword
@@ -331,7 +318,6 @@ _groupmems()
 } &&
 complete -F _groupmems groupmems
 
-have grpck &&
 _grpck()
 {
     local cur prev words cword
@@ -346,7 +332,6 @@ _grpck()
 } &&
 complete -F _grpck grpck
 
-have vipw || have vigr &&
 _vipw()
 {
     local cur prev words cword
@@ -365,7 +350,6 @@ _vipw()
 } &&
 complete -F _vipw vipw vigr
 
-have faillog &&
 _faillog()
 {
     local cur prev words cword split
@@ -391,7 +375,6 @@ _faillog()
 } &&
 complete -F _faillog faillog
 
-have lastlog &&
 _lastlog()
 {
     local cur prev words cword split
diff --git a/completions/sitecopy b/completions/sitecopy
index 0762f87c..c12b3609 100644
--- a/completions/sitecopy
+++ b/completions/sitecopy
@@ -3,8 +3,6 @@
 #           2011 Raphaël Droz <raphael.droz+floss@gmail.com>
 # License: GNU GPL v2 or later
 
-have sitecopy || return
-
 _sitecopy()
 {
     local cur prev words cword split
diff --git a/completions/slackpkg b/completions/slackpkg
index bd56f443..399563c0 100644
--- a/completions/slackpkg
+++ b/completions/slackpkg
@@ -1,8 +1,6 @@
 # bash completion for slackpkg tool
 # options list is based on `grep '\-.*\=.*)' /usr/sbin/slackpkg | cut -f1 -d\)`
 
-have slackpkg || return
-
 _slackpkg()
 {
     local cur prev words cword
diff --git a/completions/slapt b/completions/slapt
index d493342d..785e2c80 100644
--- a/completions/slapt
+++ b/completions/slapt
@@ -1,6 +1,5 @@
 # slapt-get and slapt-src completion
 
-have slapt-get &&
 _slapt_get()
 {
     local cur prev words cword
@@ -79,7 +78,6 @@ _slapt_get()
     esac
 } && complete -F _slapt_get slapt-get
 
-have slapt-src &&
 _slapt_src()
 {
     local cur prev words cword
diff --git a/completions/smartctl b/completions/smartctl
index e950f875..61ec7d66 100644
--- a/completions/smartctl
+++ b/completions/smartctl
@@ -1,7 +1,5 @@
 # bash completion for smartctl(8)
 
-have smartctl || return
-
 _smartctl_quietmode()
 {
     COMPREPLY=( $( compgen -W 'errorsonly silent noserial' -- "$cur" ) )
diff --git a/completions/snownews b/completions/snownews
index 7cdacb54..3ba2dc79 100644
--- a/completions/snownews
+++ b/completions/snownews
@@ -1,7 +1,5 @@
 # snownews(1) completion
 
-have snownews || return
-
 _snownews()
 {
     local cur prev words cword
diff --git a/completions/sqlite3 b/completions/sqlite3
index fe76652a..e65e27d0 100644
--- a/completions/sqlite3
+++ b/completions/sqlite3
@@ -1,7 +1,5 @@
 # sqlite3(1) completion
 
-have sqlite3 || return
-
 _sqlite3()
 {
     local cur prev words cword
diff --git a/completions/ssh b/completions/ssh
index ebce83ca..fbceff65 100644
--- a/completions/ssh
+++ b/completions/ssh
@@ -1,7 +1,5 @@
 # ssh(1) completion
 
-have ssh || return
-
 _ssh_ciphers()
 {
     COMPREPLY+=( $( compgen -W '3des-cbc aes128-cbc \
diff --git a/completions/sshfs b/completions/sshfs
index b29d1d58..b557486e 100644
--- a/completions/sshfs
+++ b/completions/sshfs
@@ -1,7 +1,5 @@
 # sshfs(1) completion
 
-have sshfs || return
-
 _sshfs()
 {
     local cur prev words cword
diff --git a/completions/strace b/completions/strace
index 5d2b98d3..18ca69ef 100644
--- a/completions/strace
+++ b/completions/strace
@@ -1,7 +1,5 @@
 # bash completion for strace
 
-have strace || return
-
 _strace()
 {
     local cur prev words cword
diff --git a/completions/svk b/completions/svk
index 3aa1b322..bccc1689 100644
--- a/completions/svk
+++ b/completions/svk
@@ -1,7 +1,5 @@
 # svk(1) completion
 
-have svk || return
-
 _svk()
 {
     local cur prev words cword
diff --git a/completions/sysbench b/completions/sysbench
index 496a39bd..854f4cb5 100644
--- a/completions/sysbench
+++ b/completions/sysbench
@@ -1,7 +1,5 @@
 # bash completion for sysbench
 
-have sysbench || return
-
 _sysbench()
 {
     local cur prev words cword split
diff --git a/completions/sysctl b/completions/sysctl
index 8c7d68a8..b6e1a278 100644
--- a/completions/sysctl
+++ b/completions/sysctl
@@ -1,7 +1,5 @@
 # bash completion for sysctl
 
-have sysctl || return
-
 _sysctl()
 {
     local cur prev words cword
diff --git a/completions/sysv-rc b/completions/sysv-rc
index 6e480a40..b2015c6a 100644
--- a/completions/sysv-rc
+++ b/completions/sysv-rc
@@ -2,7 +2,6 @@
 #
 # Copyright (C) 2004 Servilio Afre Puentes <servilio@gmail.com>
 
-have update-rc.d &&
 _update_rc_d()
 {
     local cur prev words cword
@@ -67,7 +66,6 @@ complete -F _update_rc_d update-rc.d
 #
 # Copyright (C) 2004 Servilio Afre Puentes <servilio@gmail.com>
 #
-have invoke-rc.d &&
 _invoke_rc_d()
 {
     local cur prev words cword
diff --git a/completions/tar b/completions/tar
index 0a650cee..8ea292e0 100644
--- a/completions/tar
+++ b/completions/tar
@@ -1,7 +1,5 @@
 # bash completion for GNU tar
 
-have tar || return
-
 _tar()
 {
     local cur prev words cword split
diff --git a/completions/tcpdump b/completions/tcpdump
index bd09a10a..802835e1 100644
--- a/completions/tcpdump
+++ b/completions/tcpdump
@@ -1,7 +1,5 @@
 # bash completion for tcpdump
 
-have tcpdump || return
-
 _tcpdump()
 {
     local cur prev words cword
diff --git a/completions/unace b/completions/unace
index 17380c29..0b93a3da 100644
--- a/completions/unace
+++ b/completions/unace
@@ -1,7 +1,5 @@
 # unace(1) completion
 
-have unace || return
-
 _unace()
 {
     local cur prev words cword
diff --git a/completions/unrar b/completions/unrar
index f83ef3b0..917cb2e5 100644
--- a/completions/unrar
+++ b/completions/unrar
@@ -1,7 +1,5 @@
 # unrar(1) completion
 
-have unrar || return
-
 _unrar()
 {
     local cur prev words cword
diff --git a/completions/update-alternatives b/completions/update-alternatives
index 5033cc54..1e9b7686 100644
--- a/completions/update-alternatives
+++ b/completions/update-alternatives
@@ -1,7 +1,5 @@
 # bash completion for update-alternatives
 
-have update-alternatives || return
-
 _installed_alternatives()
 {
     local admindir
diff --git a/completions/util-linux b/completions/util-linux
index 6246b118..c31acb51 100644
--- a/completions/util-linux
+++ b/completions/util-linux
@@ -2,7 +2,6 @@
 
 # renice(8) completion
 #
-have renice &&
 _renice()
 {
     local cur prev words cword
@@ -31,7 +30,6 @@ complete -F _renice renice
 
 # kill(1) completion
 #
-have kill &&
 _kill()
 {
     local cur prev words cword
@@ -49,7 +47,6 @@ complete -F _kill kill
 
 # look(1) completion
 #
-have look &&
 _look()
 {
     local cur prev words cword
@@ -61,7 +58,6 @@ _look()
 } &&
 complete -F _look -o default look
 
-have ionice &&
 _ionice()
 {
     local cur prev words cword
@@ -116,7 +112,6 @@ _ionice()
 } &&
 complete -F _ionice ionice
 
-have dmesg &&
 _dmesg()
 {
     [[ $OSTYPE == *solaris* ]] && return # no args there
diff --git a/completions/vncviewer b/completions/vncviewer
index 955dd47f..2cabfd9b 100644
--- a/completions/vncviewer
+++ b/completions/vncviewer
@@ -1,6 +1,5 @@
 # bash completion for vncviewer
 
-have vncviewer &&
 _vncviewer_bootstrap()
 {
     local fname
@@ -17,7 +16,6 @@ _vncviewer_bootstrap()
 } &&
 complete -F _vncviewer_bootstrap vncviewer
 
-have tightvncviewer &&
 _tightvncviewer()
 {
     local cur prev words cword
@@ -56,7 +54,6 @@ complete -F _tightvncviewer tightvncviewer
 # NOTE: - VNC Viewer options are case insensitive.
 #         Preferred case is taken from -help.
 #       - Both single dash (-) and double dash (--) are allowed as option prefix
-have xvnc4viewer &&
 _xvnc4viewer()
 {
     local cur prev words cword
diff --git a/completions/vpnc b/completions/vpnc
index 9cb35b7a..511d0251 100644
--- a/completions/vpnc
+++ b/completions/vpnc
@@ -1,7 +1,5 @@
 # bash completion for vpnc
 
-have vpnc || return
-
 _vpnc()
 {
     local cur prev words cword
diff --git a/completions/wireless-tools b/completions/wireless-tools
index 75c348ca..ea43baab 100644
--- a/completions/wireless-tools
+++ b/completions/wireless-tools
@@ -1,8 +1,7 @@
 # bash completion for Linux wireless-tools
 
-[ $UNAME = Linux ] || return
+[ $UNAME = Linux ] || return 1
 
-have iwconfig &&
 _iwconfig()
 {
     local cur prev words cword
@@ -91,7 +90,6 @@ _iwconfig()
 complete -F _iwconfig iwconfig
 
 
-have iwlist &&
 _iwlist()
 {
     local cur prev words cword
@@ -112,7 +110,6 @@ _iwlist()
 complete -F _iwlist iwlist
 
 
-have iwspy &&
 _iwspy()
 {
     local cur prev words cword
@@ -131,7 +128,6 @@ _iwspy()
 complete -F _iwspy iwspy
 
 
-have iwpriv &&
 _iwpriv()
 {
     local cur prev words cword
diff --git a/completions/wodim b/completions/wodim
index bc2912a7..8c762f95 100644
--- a/completions/wodim
+++ b/completions/wodim
@@ -1,7 +1,5 @@
 # bash completion for cdrecord/wodim
 
-have cdrecord || have wodim || return
-
 _cdrecord()
 {
     local cur prev words cword
diff --git a/completions/wol b/completions/wol
index 001e2f61..8a6a3a60 100644
--- a/completions/wol
+++ b/completions/wol
@@ -1,7 +1,5 @@
 # wol(1) completion
 
-have wol || return
-
 _wol()
 {
     local cur prev words cword split
diff --git a/completions/wtf b/completions/wtf
index 545a2e5c..58b422dd 100644
--- a/completions/wtf
+++ b/completions/wtf
@@ -1,8 +1,6 @@
 # wtf completion
 # Raphael Droz, 25/09/2009
 
-have wtf || return
-
 _wtf()
 {
     local cur prev words cword
diff --git a/completions/wvdial b/completions/wvdial
index 4a2620c3..e2f73b78 100644
--- a/completions/wvdial
+++ b/completions/wvdial
@@ -1,7 +1,5 @@
 # bash completion for wvdial
 
-have wvdial || return
-
 _wvdial()
 {
     local cur prev words cword split
diff --git a/completions/xgamma b/completions/xgamma
index fba7cd55..164a5de4 100644
--- a/completions/xgamma
+++ b/completions/xgamma
@@ -1,7 +1,5 @@
 # bash completion for xgamma(1)
 
-have xgamma || return
-
 _xgamma()
 {
     local cur prev words cword
diff --git a/completions/xhost b/completions/xhost
index 2cbabe86..8a529740 100644
--- a/completions/xhost
+++ b/completions/xhost
@@ -1,7 +1,5 @@
 # xhost(1) completion
 
-have xhost || return
-
 _xhost ()
 {
     local cur prev words cword
diff --git a/completions/xm b/completions/xm
index dfed9836..0cc6e783 100644
--- a/completions/xm
+++ b/completions/xm
@@ -1,7 +1,5 @@
 # bash completion for xm
 
-have xm || return
-
 _xen_domain_names()
 {
     COMPREPLY=( $(compgen -W "$( xm list 2>/dev/null | \
diff --git a/completions/xmllint b/completions/xmllint
index 64f53c26..3d941f2b 100644
--- a/completions/xmllint
+++ b/completions/xmllint
@@ -1,7 +1,5 @@
 # bash completion for xmllint(1)
 
-have xmllint || return
-
 _xmllint()
 {
     local cur prev words cword
diff --git a/completions/xmlwf b/completions/xmlwf
index 0fd49700..83612007 100644
--- a/completions/xmlwf
+++ b/completions/xmlwf
@@ -1,7 +1,5 @@
 # bash completion for xmlwf(1)
 
-have xmlwf || return
-
 _xmlwf()
 {
     local cur prev words cword
diff --git a/completions/xmms b/completions/xmms
index 933c949a..697c9da3 100644
--- a/completions/xmms
+++ b/completions/xmms
@@ -1,7 +1,5 @@
 # bash completion for xmms
 
-have xmms || return
-
 _xmms()
 {
     local cur prev words cword split
diff --git a/completions/xmodmap b/completions/xmodmap
index 595b26e7..b50800d5 100644
--- a/completions/xmodmap
+++ b/completions/xmodmap
@@ -1,7 +1,5 @@
 # xmodmap(1) completion
 
-have xmodmap || return
-
 _xmodmap()
 {
     local cur prev words cword
diff --git a/completions/xrandr b/completions/xrandr
index 964b79fa..c636304f 100644
--- a/completions/xrandr
+++ b/completions/xrandr
@@ -1,7 +1,5 @@
 # bash completion for xrandr
 
-have xrandr || return
-
 _xrandr()
 {
     local cur prev words cword
diff --git a/completions/xrdb b/completions/xrdb
index 8170c1c6..99188802 100644
--- a/completions/xrdb
+++ b/completions/xrdb
@@ -1,7 +1,5 @@
 # xrdb(1) completion
 
-have xrdb || return
-
 _xrdb()
 {
     local cur prev words cword
diff --git a/completions/xsltproc b/completions/xsltproc
index dcf4d07f..010eb7b5 100644
--- a/completions/xsltproc
+++ b/completions/xsltproc
@@ -1,7 +1,5 @@
 # xsltproc(1) completion
 
-have xsltproc || return
-
 _xsltproc()
 {
     local cur prev words cword
diff --git a/completions/xz b/completions/xz
index 3cf05271..c3c35d82 100644
--- a/completions/xz
+++ b/completions/xz
@@ -1,6 +1,5 @@
 # xz(1) completion
 
-have xz || have pxz &&
 _xz()
 {
     local cur prev words cword split
@@ -55,7 +54,6 @@ complete -F _xz xz pxz
 
 # xzdec(1) completion
 #
-have xzdec &&
 _xzdec()
 {
     local cur prev words cword split
diff --git a/completions/yp-tools b/completions/yp-tools
index f777a5b0..a93a9ebf 100644
--- a/completions/yp-tools
+++ b/completions/yp-tools
@@ -1,7 +1,5 @@
 # bash completion for yp-tools
 
-have ypcat || return
-
 _ypmatch()
 {
     local cur prev words cword
diff --git a/completions/yum-arch b/completions/yum-arch
index eb02b924..f095ae12 100644
--- a/completions/yum-arch
+++ b/completions/yum-arch
@@ -1,7 +1,5 @@
 # yum-arch(8) completion
 
-have yum-arch || return
-
 _yum_arch()
 {
     local cur prev words cword