diff --git a/completions/_modules b/completions/_modules
index 922eb898..77a59454 100644
--- a/completions/_modules
+++ b/completions/_modules
@@ -79,7 +79,7 @@ _module ()
         esac
     fi
     return 0
-}
+} &&
 complete -F _module -o default module
 }
 
diff --git a/completions/_subversion b/completions/_subversion
index 91523d89..0d76d69f 100644
--- a/completions/_subversion
+++ b/completions/_subversion
@@ -215,7 +215,7 @@ _svn()
     fi
 
     return 0
-}
+} &&
 complete -F _svn svn
 
 _svnadmin()
@@ -288,7 +288,7 @@ _svnadmin()
     fi
 
     return 0
-}
+} &&
 complete -F _svnadmin -o default svnadmin
 
 _svnlook()
@@ -347,7 +347,7 @@ _svnlook()
     fi
 
     return 0
-}
+} &&
 complete -F _svnlook -o default svnlook
 }
 
diff --git a/completions/ant b/completions/ant
index 132c4390..c406c015 100644
--- a/completions/ant
+++ b/completions/ant
@@ -56,7 +56,7 @@ _ant()
             sed -ne 's/.*<target .*name="\([^"]*\).*/\1/p' 2>/dev/null )" \
             -- "$cur" ) )
         fi
-}
+} &&
 have complete-ant-cmd.pl && \
      complete -C complete-ant-cmd.pl -F _ant ant || complete -F _ant ant
 }
diff --git a/completions/apache2ctl b/completions/apache2ctl
index 287443a2..c2e16deb 100644
--- a/completions/apache2ctl
+++ b/completions/apache2ctl
@@ -1,7 +1,8 @@
 # apache2ctl(1) completion
 
 have apache2ctl && {
-_apache2ctl() {
+_apache2ctl()
+{
     local APWORDS cur
 
     COMPREPLY=()
@@ -11,7 +12,7 @@ _apache2ctl() {
         tr "|" " ")
 
     COMPREPLY=( $( compgen -W "$APWORDS" -- "$cur" ) )
-}
+} &&
 complete -F _apache2ctl apache2ctl
 }
 
diff --git a/completions/aptitude b/completions/aptitude
index c00ad40e..d04bd354 100644
--- a/completions/aptitude
+++ b/completions/aptitude
@@ -85,7 +85,7 @@ _aptitude()
     fi
 
     return 0
-}
+} &&
 complete -F _aptitude -o default aptitude
 }
 
diff --git a/completions/aspell b/completions/aspell
index 7b2e6f17..88e7336e 100644
--- a/completions/aspell
+++ b/completions/aspell
@@ -88,8 +88,7 @@ _aspell()
         COMPREPLY=( $( compgen -W 'usage help check pipe list \
             config soundslike filter version dump create merge' -- "$cur" ) )
     fi
-
-}
+} &&
 complete -F _aspell aspell
 }
 
diff --git a/completions/bash-builtins b/completions/bash-builtins
index 3eba8a11..6ceb7f8a 100644
--- a/completions/bash-builtins
+++ b/completions/bash-builtins
@@ -16,7 +16,7 @@ _alias()
                 -e 's|^alias '"$cur"'\(.*\)$|\1|' )" )
             ;;
     esac
-}
+} &&
 complete -F _alias -o nospace alias
 
 # bash export completion
@@ -42,7 +42,7 @@ _export()
                   echo -n \' ) )" )
             ;;
     esac
-}
+} &&
 complete -F _export -o default -o nospace export
 
 # bash shell function completion
@@ -65,7 +65,7 @@ _function()
     else
         COMPREPLY=( "() $( type -- ${COMP_WORDS[1]} | sed -e 1,2d )" )
     fi
-}
+} &&
 complete -F _function function declare typeset
 
 # bash complete completion
@@ -116,7 +116,7 @@ _complete()
     else
         COMPREPLY=( $( compgen -A command -- "$cur" ) )
     fi
-}
+} &&
 complete -F _complete compgen complete
 
 # Local variables:
diff --git a/completions/bitkeeper b/completions/bitkeeper
index 4c312a14..79436a0f 100644
--- a/completions/bitkeeper
+++ b/completions/bitkeeper
@@ -1,7 +1,8 @@
 # BitKeeper completion adapted from code by  Bart Trojanowski <bart@jukie.net>
 
 have bk &&
-_bk() {
+_bk()
+{
     local BKCMDS
 
     COMPREPLY=()
diff --git a/completions/bittorrent b/completions/bittorrent
index 761d0836..d40b90d0 100644
--- a/completions/bittorrent
+++ b/completions/bittorrent
@@ -30,7 +30,8 @@ _btdownload()
         _filedir
     fi
 } &&
-complete -F _btdownload btdownloadheadless.py btdownloadcurses.py btdownloadgui.py
+complete -F _btdownload btdownloadheadless.py btdownloadcurses.py \
+    btdownloadgui.py
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/bluez b/completions/bluez
index 7a2b1e57..f547cae8 100644
--- a/completions/bluez
+++ b/completions/bluez
@@ -107,7 +107,7 @@ _hcitool()
                 ;;
         esac
     fi
-}
+} &&
 complete -F _hcitool hcitool
 
 _sdptool()
@@ -168,7 +168,7 @@ _sdptool()
                 ;;
         esac
     fi
-}
+} &&
 complete -F _sdptool sdptool
 
 _l2ping()
@@ -190,8 +190,7 @@ _l2ping()
     else
         _bluetooth_adresses
     fi
-
-}
+} &&
 complete -F _l2ping l2ping
 
 _rfcomm()
@@ -236,7 +235,7 @@ _rfcomm()
             esac
         fi
     fi
-}
+} &&
 complete -F _rfcomm rfcomm
 
 _ciptool()
@@ -272,7 +271,7 @@ _ciptool()
                 ;;
         esac
     fi
-}
+} &&
 complete -F _ciptool ciptool
 
 _dfutool()
@@ -303,7 +302,7 @@ _dfutool()
                 ;;
         esac
     fi
-}
+} &&
 complete -F _dfutool dfutool
 
 _hciconfig()
@@ -349,7 +348,7 @@ _hciconfig()
                 ;;
         esac
     fi
-}
+} &&
 complete -F _hciconfig hciconfig
 
 _hciattach()
@@ -386,8 +385,7 @@ _hciattach()
                 ;;
         esac
     fi
-
-}
+} &&
 complete -F _hciattach hciattach
 
 _hid2hci()
@@ -401,7 +399,7 @@ _hid2hci()
         COMPREPLY=( $( compgen -W '--help --quiet -0 --tohci -1 \
             --tohid' -- "$cur" ) )
     fi
-}
+} &&
 complete -F _hid2hci hid2hci
 
 _avctrl()
@@ -419,7 +417,7 @@ _avctrl()
             COMPREPLY=( $( compgen -W 'discover switch' -- "$cur" ) )
         fi
     fi
-}
+} &&
 complete -F _avctrl avctrl
 }
 
diff --git a/completions/cfengine b/completions/cfengine
index 50a13840..c20382f6 100644
--- a/completions/cfengine
+++ b/completions/cfengine
@@ -29,7 +29,7 @@ _cfagent()
     if [[ "$cur" == -* ]]; then
         _cfagent_options
     fi
-}
+} &&
 complete -F _cfagent cfagent
 
 _cfrun()
@@ -75,7 +75,7 @@ _cfrun()
             _cfagent_options
             ;;
     esac
-}
+} &&
 complete -F _cfrun cfrun
 }
 
diff --git a/completions/chsh b/completions/chsh
index 1af3630f..49ada4af 100644
--- a/completions/chsh
+++ b/completions/chsh
@@ -25,7 +25,7 @@ _chsh()
     fi
 
     return 0
-}
+} &&
 complete -F _chsh chsh
 
 # Local variables:
diff --git a/completions/configure b/completions/configure
index 1b207692..ccdf5210 100644
--- a/completions/configure
+++ b/completions/configure
@@ -32,7 +32,7 @@ _configure()
             if ($2 ~ /--[A-Za-z]/) print $2 }' | sed -e 's/[[,=].*//g' )" \
             -- "$cur" ) )
     fi
-}
+} &&
 complete -F _configure configure
 
 # Local variables:
diff --git a/completions/cpio b/completions/cpio
index 5ead0184..64f4c874 100644
--- a/completions/cpio
+++ b/completions/cpio
@@ -90,7 +90,7 @@ _cpio()
                 ;;
         esac
     fi
-}
+} &&
 complete -F _cpio cpio
 }
 
diff --git a/completions/cvs b/completions/cvs
index be3b1be7..5f625a4b 100644
--- a/completions/cvs
+++ b/completions/cvs
@@ -379,7 +379,7 @@ _cvs()
     esac
 
     return 0
-}
+} &&
 complete -F _cvs -o default cvs
 }
 
diff --git a/completions/dhclient b/completions/dhclient
index 3d7e1e1a..42185b7e 100644
--- a/completions/dhclient
+++ b/completions/dhclient
@@ -1,6 +1,7 @@
 # bash completion for dhclient
 
-have dhclient && _dhclient()
+have dhclient &&
+_dhclient()
 {
     local cur prev
 
diff --git a/completions/dict b/completions/dict
index 4cfdf98f..1f728e05 100644
--- a/completions/dict
+++ b/completions/dict
@@ -1,6 +1,6 @@
 # dict(1) completion
 
-{ have dict || have rdict; } && {
+have dict || have rdict && {
 _dictdata()
 {
     dict $host $port $1 2>/dev/null | sed -ne \
@@ -64,7 +64,7 @@ _dict()
 
     [ -r $dictfile ] && \
         COMPREPLY=( $( compgen -W '$( cat $dictfile )' -- "$cur" ) )
-}
+} &&
 complete -F _dict -o default dict rdict
 }
 
diff --git a/completions/dpkg b/completions/dpkg
index cd53f3e2..8bb862ab 100644
--- a/completions/dpkg
+++ b/completions/dpkg
@@ -91,7 +91,7 @@ _dpkg()
     esac
 
 
-}
+} &&
 complete -F _dpkg dpkg dpkg-deb
 }
 
diff --git a/completions/gpg b/completions/gpg
index 878a800b..5e8adbac 100644
--- a/completions/gpg
+++ b/completions/gpg
@@ -34,8 +34,7 @@ _gpg()
 
     if [[ "$cur" == -* ]]; then
         COMPREPLY=( $( compgen -W '$(gpg --dump-options)' -- "$cur" ) )
-     fi
-
+    fi
 } &&
 complete -F _gpg -o default gpg
 
diff --git a/completions/gpg2 b/completions/gpg2
index b99783f9..0589a138 100644
--- a/completions/gpg2
+++ b/completions/gpg2
@@ -1,7 +1,7 @@
 # gpg2(1) completion
 
 have gpg2 && {
-_gpg2 ()
+_gpg2()
 {
     local cur prev
 
diff --git a/completions/heimdal b/completions/heimdal
index c1efb110..2cc42276 100644
--- a/completions/heimdal
+++ b/completions/heimdal
@@ -3,21 +3,18 @@
 have ktutil && {
 _heimdal_principals()
 {
-
     COMPREPLY=( $( compgen -W "$( kadmin -l dump 2>/dev/null | \
         awk '{print $1}' )" -- "$cur" ) )
 }
 
 _heimdal_realms()
 {
-
     COMPREPLY=( $( compgen -W "( kadmin -l dump 2>/dev/null | \
         awk '{print $1}' | awk -F@ '{print $2}' )" -- "$cur" ) )
 }
 
 _heimdal_encodings()
 {
-
     COMPREPLY=( $( compgen -W 'des-cbc-mcrc des-cbc-md4 des-cbc-md5 \
         des3-cbc-sha1 arcfour-hmac-md5 aes128-cts-hmac-sha1-96 \
         aes256-cts-hmac-sha1-96' -- "$cur" ) )
@@ -120,7 +117,7 @@ _ktutil()
                 ;;
         esac
     fi
-}
+} &&
 complete -F _ktutil ktutil
 }
 
diff --git a/completions/imagemagick b/completions/imagemagick
index c7ba74c8..efbd0e51 100644
--- a/completions/imagemagick
+++ b/completions/imagemagick
@@ -188,7 +188,7 @@ _convert()
     else
         _filedir
     fi
-}
+} &&
 complete -F _convert convert
 
 _mogrify()
@@ -244,7 +244,7 @@ _mogrify()
     else
         _filedir
     fi
-}
+} &&
 complete -F _mogrify mogrify
 
 _display()
@@ -284,7 +284,7 @@ _display()
     else
         _filedir
     fi
-}
+} &&
 complete -F _display display
 
 _animate()
@@ -318,7 +318,7 @@ _animate()
     else
         _filedir
     fi
-}
+} &&
 complete -F _animate animate
 
 _identify()
@@ -343,7 +343,7 @@ _identify()
     else
         _filedir
     fi
-}
+} &&
 complete -F _identify identify
 
 _montage()
@@ -381,7 +381,7 @@ _montage()
     else
         _filedir
     fi
-}
+} &&
 complete -F _montage montage
 
 _composite()
@@ -416,7 +416,7 @@ _composite()
     else
         _filedir
     fi
-}
+} &&
 complete -F _composite composite
 
 _compare()
@@ -443,7 +443,7 @@ _compare()
     else
         _filedir
     fi
-}
+} &&
 complete -F _compare compare
 
 _conjure()
@@ -463,7 +463,7 @@ _conjure()
     else
         _filedir
     fi
-}
+} &&
 complete -F _conjure conjure
 
 _import()
@@ -494,7 +494,7 @@ _import()
     else
         _filedir
     fi
-}
+} &&
 complete -F _import import
 
 _stream()
@@ -519,7 +519,7 @@ _stream()
     else
         _filedir
     fi
-}
+} &&
 complete -F _stream stream
 }
 
diff --git a/completions/kldload b/completions/kldload
index e5bce0a3..878c8370 100644
--- a/completions/kldload
+++ b/completions/kldload
@@ -17,7 +17,7 @@ _kldload()
     COMPREPLY=( ${COMPREPLY[@]%.ko} )
 
     return 0
-}
+} &&
 complete -F _kldload kldload
 
 _kldunload()
@@ -26,7 +26,7 @@ _kldunload()
     _get_comp_words_by_ref cur
     COMPREPLY=( $( kldstat | \
         sed -ne "s/^.*[ \t]\{1,\}\($cur[a-z_]\{1,\}\).ko$/\1/p" ) )
-}
+} &&
 complete -F _kldunload kldunload
 
 }
diff --git a/completions/lilo b/completions/lilo
index ab0d9dc3..63bb5e3a 100644
--- a/completions/lilo
+++ b/completions/lilo
@@ -47,7 +47,7 @@ _lilo()
         COMPREPLY=( $( compgen -W '-A -b -c -C -d -f -g -i -I -l -L -m \
             -M -p -P -q -r -R -s -S -t -T -u -U -v -V -w -x -z' -- "$cur" ) )
     fi
-}
+} &&
 complete -F _lilo lilo
 }
 
diff --git a/completions/lintian b/completions/lintian
index e2237893..100d7556 100644
--- a/completions/lintian
+++ b/completions/lintian
@@ -4,7 +4,8 @@
 # bash completion for lintian(1) and lintian-info(1)
 
 have lintian && {
-_lintian_tags() {
+_lintian_tags()
+{
     local match search tags
 
     tags=$( grep -e ^Tag /usr/share/lintian/checks/*.desc | cut -d\  -f2 )
@@ -25,7 +26,8 @@ _lintian_tags() {
     return 0
 }
 
-_lintian_checks() {
+_lintian_checks()
+{
     local match search todisable checks
 
     checks=$(grep -e ^Check-Script -e ^Abbrev \
@@ -51,7 +53,8 @@ _lintian_checks() {
     return 0
 }
 
-_lintian_infos() {
+_lintian_infos()
+{
     local match search infos
 
     infos=$(grep -e ^Collector /usr/share/lintian/collection/*.desc \
@@ -73,11 +76,13 @@ _lintian_infos() {
     return 0
 }
 
-_lintian_arches() {
+_lintian_arches()
+{
     return 0
 }
 
-_lintian() {
+_lintian()
+{
     local cur prev action lint_actions general_opts behaviour_opts \
           configuration_opts selection_opts
 
@@ -156,9 +161,11 @@ _lintian() {
             ;;
     esac
     return 0
-}
+} &&
+complete -F _lintian lintian
 
-_lintian_info() {
+_lintian_info()
+{
     local cur prev
 
     _get_comp_words_by_ref cur prev
@@ -179,8 +186,6 @@ _lintian_info() {
             ;;
     esac
     return 0
-}
-
-complete -F _lintian lintian
+} &&
 complete -F _lintian_info lintian-info
 }
diff --git a/completions/lvm b/completions/lvm
index f4d3b77d..e17a4a9c 100644
--- a/completions/lvm
+++ b/completions/lvm
@@ -55,7 +55,7 @@ _lvmdiskscan()
         COMPREPLY=( $( compgen -W '--debug --help \
             --lvmpartition --verbose --version' -- "$cur" ) )
     fi
-}
+} &&
 complete -F _lvmdiskscan lvmdiskscan
 
 _pvscan()
@@ -70,7 +70,7 @@ _pvscan()
             --help --ignorelockingfailure --partial --short --uuid \
             --verbose --version' -- "$cur" ) )
     fi
-}
+} &&
 complete -F _pvscan pvscan
 
 _pvs()
@@ -102,7 +102,7 @@ _pvs()
     else
         _physicalvolumes
     fi
-}
+} &&
 complete -F _pvs pvs
 
 _pvdisplay()
@@ -125,7 +125,7 @@ _pvdisplay()
     else
         _physicalvolumes
     fi
-}
+} &&
 complete -F _pvdisplay pvdisplay
 
 _pvchange()
@@ -150,7 +150,7 @@ _pvchange()
     else
         _physicalvolumes
     fi
-}
+} &&
 complete -F _pvchange pvchange
 
 _pvcreate()
@@ -188,7 +188,7 @@ _pvcreate()
     else
         _physicalvolumes
     fi
-}
+} &&
 complete -F _pvcreate pvcreate
 
 _pvmove()
@@ -215,7 +215,7 @@ _pvmove()
     else
         _physicalvolumes
     fi
-}
+} &&
 complete -F _pvmove pvmove
 
 _pvremove()
@@ -231,7 +231,7 @@ _pvremove()
     else
         _physicalvolumes
     fi
-}
+} &&
 complete -F _pvremove pvremove
 
 _vgscan()
@@ -246,7 +246,7 @@ _vgscan()
             --ignorelockingfailure --mknodes \
             --partial --verbose --version' -- "$cur" ) )
     fi
-}
+} &&
 complete -F _vgscan vgscan
 
 _vgs()
@@ -280,7 +280,7 @@ _vgs()
     else
         _volumegroups
     fi
-}
+} &&
 complete -F _vgs vgs
 
 _vgdisplay()
@@ -304,7 +304,7 @@ _vgdisplay()
     else
         _volumegroups
     fi
-}
+} &&
 complete -F _vgdisplay vgdisplay
 
 _vgchange()
@@ -330,7 +330,7 @@ _vgchange()
     else
         _volumegroups
     fi
-}
+} &&
 complete -F _vgchange vgchange
 
 _vgcreate()
@@ -368,7 +368,7 @@ _vgcreate()
             _physicalvolumes
         fi
     fi
-}
+} &&
 complete -F _vgcreate vgcreate
 
 _vgremove()
@@ -384,7 +384,7 @@ _vgremove()
     else
         _volumegroups
     fi
-}
+} &&
 complete -F _vgremove vgremove
 
 _vgrename()
@@ -407,7 +407,7 @@ _vgrename()
     else
         _volumegroups
     fi
-}
+} &&
 complete -F _vgrename vgrename
 
 _vgreduce()
@@ -437,7 +437,7 @@ _vgreduce()
             _physicalvolumes
         fi
     fi
-}
+} &&
 complete -F _vgreduce vgreduce
 
 _vgextend()
@@ -469,7 +469,7 @@ _vgextend()
             _physicalvolumes
         fi
     fi
-}
+} &&
 complete -F _vgextend vgextend
 
 _vgport()
@@ -485,7 +485,7 @@ _vgport()
     else
         _volumegroups
     fi
-}
+} &&
 complete -F _vgport vgimport vgexport
 
 _vgck()
@@ -501,7 +501,7 @@ _vgck()
     else
         _volumegroups
     fi
-}
+} &&
 complete -F _vgck vgck
 
 _vgconvert()
@@ -533,7 +533,7 @@ _vgconvert()
     else
         _volumegroups
     fi
-}
+} &&
 complete -F _vgconvert vgconvert
 
 _vgcfgbackup()
@@ -557,7 +557,7 @@ _vgcfgbackup()
     else
         _volumegroups
     fi
-}
+} &&
 complete -F _vgcfgbackup vgcfgbackup
 
 _vgcfgrestore()
@@ -589,7 +589,7 @@ _vgcfgrestore()
     else
         _volumegroups
     fi
-}
+} &&
 complete -F _vgcfgrestore vgcfgrestore
 
 _vgmerge()
@@ -612,7 +612,7 @@ _vgmerge()
     else
         _volumegroups
     fi
-}
+} &&
 complete -F _vgmerge vgmerge
 
 _vgsplit()
@@ -645,7 +645,7 @@ _vgsplit()
             _physicalvolumes
         fi
     fi
-}
+} &&
 complete -F _vgsplit vgsplit
 
 _vgmknodes()
@@ -661,7 +661,7 @@ _vgmknodes()
     else
         _volumegroups
     fi
-}
+} &&
 complete -F _vgmknodes vgmknodes
 
 _lvscan()
@@ -676,7 +676,7 @@ _lvscan()
             --help --ignorelockingfailure \
             --partial --verbose --version' -- "$cur" ) )
     fi
-}
+} &&
 complete -F _lvscan lvscan
 
 _lvs()
@@ -707,7 +707,7 @@ _lvs()
     else
         _logicalvolumes
     fi
-}
+} &&
 complete -F _lvs lvs
 
 _lvdisplay()
@@ -730,7 +730,7 @@ _lvdisplay()
     else
         _logicalvolumes
     fi
-}
+} &&
 complete -F _lvdisplay lvdisplay
 
 _lvchange()
@@ -761,7 +761,7 @@ _lvchange()
     else
         _logicalvolumes
     fi
-}
+} &&
 complete -F _lvchange lvchange
 
 _lvcreate()
@@ -805,7 +805,7 @@ _lvcreate()
             _physicalvolumes
         fi
     fi
-}
+} &&
 complete -F _lvcreate lvcreate
 
 _lvremove()
@@ -828,7 +828,7 @@ _lvremove()
     else
         _logicalvolumes
     fi
-}
+} &&
 complete -F _lvremove lvremove
 
 _lvrename()
@@ -851,7 +851,7 @@ _lvrename()
     else
         _logicalvolumes
     fi
-}
+} &&
 complete -F _lvrename lvrename
 
 _lvreduce()
@@ -879,7 +879,7 @@ _lvreduce()
     else
         _logicalvolumes
     fi
-}
+} &&
 complete -F _lvreduce lvreduce
 
 _lvresize()
@@ -913,7 +913,7 @@ _lvresize()
             _physicalvolumes
         fi
     fi
-}
+} &&
 complete -F _lvresize lvresize
 
 _lvextend()
@@ -947,7 +947,7 @@ _lvextend()
             _physicalvolumes
         fi
     fi
-}
+} &&
 complete -F _lvextend lvextend
 
 _lvm()
@@ -1081,7 +1081,7 @@ _lvm()
                 ;;
         esac
     fi
-}
+} &&
 complete -F _lvm lvm
 }
 
diff --git a/completions/mdadm b/completions/mdadm
index 9cbaad7b..fcabdfb7 100644
--- a/completions/mdadm
+++ b/completions/mdadm
@@ -149,7 +149,7 @@ _mdadm()
         cur=${cur:=/dev/}
         _filedir
     fi
-}
+} &&
 complete -F _mdadm mdadm
 }
 
diff --git a/completions/mplayer b/completions/mplayer
index 39711370..76966c04 100644
--- a/completions/mplayer
+++ b/completions/mplayer
@@ -256,7 +256,7 @@ _mplayer()
     esac
 
     return 0
-}
+} &&
 complete -F _mplayer mplayer mencoder gmplayer kplayer
 }
 
diff --git a/completions/mutt b/completions/mutt
index e5e9d289..d11d7a5f 100644
--- a/completions/mutt
+++ b/completions/mutt
@@ -14,7 +14,7 @@ _muttaddr()
     COMPREPLY=( "${COMPREPLY[@]}" $( compgen -u -- "$1" ) )
 
     return 0
-} # _muttaddr()
+}
 
 
 # Find muttrc to use
@@ -44,7 +44,7 @@ _muttrc()
         fi
     fi
     printf "%s" "$muttrc"
-} # _muttrc()
+}
 
 
 # Recursively build list of sourced config files
@@ -69,7 +69,7 @@ _muttconffiles()
         shift
     done
     printf '%s\n' $sofar
-} # _muttconffiles()
+}
 
 
 # @param $1 (cur) Current word to complete
@@ -135,7 +135,7 @@ _muttfiledir()
     _filedir
 
     return 0
-} # _muttfiledir
+}
 
 
 _mutt()
@@ -173,9 +173,9 @@ _mutt()
         esac
         ;;
     esac
-} # _mutt()
+} &&
 complete -F _mutt -o default mutt muttng
-} # have mutt
+}
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/openldap b/completions/openldap
index e4bbba1f..e9277143 100644
--- a/completions/openldap
+++ b/completions/openldap
@@ -55,7 +55,7 @@ _ldapsearch()
             -LLL -M -MM -S -d -f -x -D -W -w -y -H -h -p -b -s -a \
             -P -e -E -l -z -O -I -Q -U -R -X -Y -Z -ZZ' -- "$cur" ) )
     fi
-}
+} &&
 complete -F _ldapsearch ldapsearch
 
 _ldapaddmodify()
@@ -92,7 +92,7 @@ _ldapaddmodify()
         fi
         COMPREPLY=( $( compgen -W "$options" -- "$cur" ) )
     fi
-}
+} &&
 complete -F _ldapaddmodify ldapadd ldapmodify
 
 _ldapdelete()
@@ -125,7 +125,7 @@ _ldapdelete()
         COMPREPLY=( $( compgen -W '-n -v -c -M -MM -d -f -D -W -w -y \
             -H -h -P -p -O -U -R -r -x -I -Q -X -Y -Z -ZZ' -- "$cur" ) )
     fi
-}
+} &&
 complete -F _ldapdelete ldapdelete
 
 _ldapcompare()
@@ -158,7 +158,7 @@ _ldapcompare()
         COMPREPLY=( $( compgen -W '-n -v -z -M -MM -d -D -W -w -y \
             -H -h -P -p -O -I -Q -U -R -x -X -Y -Z -ZZ' -- "$cur" ) )
     fi
-}
+} &&
 complete -F _ldapcompare ldapcompare
 
 _ldapmodrdn()
@@ -191,7 +191,7 @@ _ldapmodrdn()
         COMPREPLY=( $( compgen -W '-r -s -n -v -c -M -MM -d -D -W -w \
             -y -H -h -P -p -O -I -Q -U -R -x -X -Y -Z -ZZ -f' -- "$cur" ) )
     fi
-}
+} &&
 complete -F _ldapmodrdn ldapmodrdn
 
 _ldapwhoami()
@@ -224,7 +224,7 @@ _ldapwhoami()
         COMPREPLY=( $( compgen -W '-n -v -z -d -D -W -w -y -H -h -p -P \
             -O -I -Q -U -R -x -X -Y -Z -ZZ' -- "$cur" ) )
     fi
-}
+} &&
 complete -F _ldapwhoami ldapwhoami
 
 _ldappasswd()
@@ -253,7 +253,7 @@ _ldappasswd()
         COMPREPLY=( $( compgen -W '-A -a -t -d -D -H -h -n -p -S -s -T \
             -v -W -w -y -O -I -Q -U -R -x -X -Y -Z -ZZ' -- "$cur" ) )
     fi
-}
+} &&
 complete -F _ldappasswd ldappasswd
 }
 
diff --git a/completions/openssl b/completions/openssl
index e9796e6f..6da2dedf 100644
--- a/completions/openssl
+++ b/completions/openssl
@@ -241,7 +241,7 @@ _openssl()
             fi
         fi
     fi
-}
+} &&
 complete -F _openssl -o default openssl
 }
 
diff --git a/completions/perl b/completions/perl
index f46ae162..a3ffbe24 100644
--- a/completions/perl
+++ b/completions/perl
@@ -82,7 +82,7 @@ _perl()
     else
         _filedir
     fi
-}
+} &&
 complete -F _perl perl
 
 _perldoc()
@@ -125,7 +125,7 @@ _perldoc()
         fi
         _filedir 'p@(l|m|od)'
     fi
-}
+} &&
 complete -F _perldoc -o bashdefault perldoc
 }
 
diff --git a/completions/pkg_install b/completions/pkg_install
index 577d9c94..cb94ae75 100644
--- a/completions/pkg_install
+++ b/completions/pkg_install
@@ -16,7 +16,7 @@ _pkg_delete()
     COMPREPLY=( ${COMPREPLY[@]#$pkgdir} )
 
     return 0
-}
+} &&
 complete -F _pkg_delete -o dirnames pkg_delete pkg_info
 
 }
diff --git a/completions/postfix b/completions/postfix
index 64929488..c3d3eb6c 100644
--- a/completions/postfix
+++ b/completions/postfix
@@ -28,7 +28,7 @@ _postfix()
 
     COMPREPLY=( $( compgen -W 'check start stop abort flush reload status \
         set-permissions upgrade-configuration' -- "$cur" ) )
-}
+} &&
 complete -F _postfix postfix
 
 # postalias(1) and postmap(1)
@@ -74,7 +74,7 @@ _postmap()
         fi
     fi
     return 0
-}
+} &&
 complete -F _postmap postmap postalias
 
 # postcat(1)
@@ -117,7 +117,7 @@ _postcat()
         _filedir
         return 0
     fi
-}
+} &&
 complete -F _postcat postcat
 
 # postconf(1)
@@ -159,7 +159,7 @@ _postconf()
         fi
     done
     return 0
-}
+} &&
 complete -F _postconf postconf
 
 # postsuper(1)
@@ -220,7 +220,7 @@ _postsuper()
     fi
 
     COMPREPLY=( $( compgen -W 'hold incoming active deferred' -- "$cur" ) )
-}
+} &&
 complete -F _postsuper postsuper
 }
 
diff --git a/completions/postgresql b/completions/postgresql
index f874b67b..d0a2efc2 100644
--- a/completions/postgresql
+++ b/completions/postgresql
@@ -56,7 +56,7 @@ _createdb()
     else
         _pg_databases
     fi
-}
+} &&
 complete -F _createdb -o default createdb
 
 # dropdb(1) completion
@@ -93,7 +93,7 @@ _dropdb()
     else
         _pg_databases
     fi
-}
+} &&
 complete -F _dropdb -o default dropdb
 
 # psql(1) completion
@@ -149,7 +149,7 @@ _psql()
         # return list of available databases
         _pg_databases
     fi
-}
+} &&
 complete -F _psql psql
 }
 
diff --git a/completions/quota-tools b/completions/quota-tools
index 2b528d92..f87bb1df 100644
--- a/completions/quota-tools
+++ b/completions/quota-tools
@@ -56,7 +56,7 @@ _quota()
     else
         _user_or_group
     fi
-}
+} &&
 complete -F _quota -o default quota
 
 _setquota()
@@ -95,7 +95,7 @@ _setquota()
         esac
 
     fi
-}
+} &&
 complete -F _setquota -o default setquota
 
 _edquota()
@@ -127,7 +127,7 @@ _edquota()
     else
         _user_or_group
     fi
-}
+} &&
 complete -F _edquota -o default edquota
 
 _quotacheck()
@@ -156,7 +156,7 @@ _quotacheck()
     else
         _filesystems
     fi
-}
+} &&
 complete -F _quotacheck -o default quotacheck
 
 _repquota()
@@ -185,7 +185,7 @@ _repquota()
     else
         _filesystems
     fi
-}
+} &&
 complete -F _repquota -o default repquota
 
 _quotaon()
@@ -212,7 +212,7 @@ _quotaon()
     else
         _filesystems
     fi
-}
+} &&
 complete -F _quotaon -o default quotaon
 
 _quotaoff()
@@ -244,7 +244,7 @@ _quotaoff()
     else
         _filesystems
     fi
-}
+} &&
 complete -F _quotaoff -o default quotaoff
 }
 
diff --git a/completions/ri b/completions/ri
index be66d98f..b4ad30aa 100644
--- a/completions/ri
+++ b/completions/ri
@@ -83,7 +83,7 @@ _ri()
     # we're completing on methods
     method=$cur
     ri_get_methods
-}
+} &&
 complete -F _ri ri
 }
 
diff --git a/completions/rpcdebug b/completions/rpcdebug
index a7c5e971..ee27e5ee 100644
--- a/completions/rpcdebug
+++ b/completions/rpcdebug
@@ -43,7 +43,7 @@ _rpcdebug()
     if [[ "$cur" == -* ]]; then
         COMPREPLY=( $( compgen -W '-v -h -m -s -c' -- "$cur" ) )
     fi
-}
+} &&
 complete -F _rpcdebug rpcdebug
 }
 
diff --git a/completions/samba b/completions/samba
index 61d78abc..7aaee53c 100644
--- a/completions/samba
+++ b/completions/samba
@@ -90,7 +90,7 @@ _smbclient()
             -p -R -s -k -P -c -D -W -l -E --debuglevel \
             --log-basename --workgroup' -- "$cur" ) )
     fi
-}
+} &&
 complete -F _smbclient smbclient
 
 _smbget()
@@ -122,7 +122,7 @@ _smbget()
             --rcfile -q --quiet -v --verbose -b --blocksize -? --help --usage' \
             -- "$cur" ) )
     fi
-}
+} &&
 complete -F _smbget smbget
 
 _smbcacls()
@@ -155,7 +155,7 @@ _smbcacls()
         COMPREPLY=( $( compgen -W '-a -M -D -S -U -C -G --numeric -t \
             -h --help -V -s -d --debuglevel -l --log-basename' -- "$cur" ) )
     fi
-}
+} &&
 complete -F _smbcacls smbcacls
 
 _smbcquotas()
@@ -189,7 +189,7 @@ _smbcquotas()
             -s --debuglevel --log-basename -N -k \
             --authentication-file --user' -- "$cur" ) )
     fi
-}
+} &&
 complete -F _smbcquotas smbcquotas
 
 _smbpasswd()
@@ -222,7 +222,7 @@ _smbpasswd()
         COMPREPLY=( $( compgen -W '-a -c -x -d -e -D -n -r -R -m -U -h \
             -s -w -W -i -L' -- "$cur" ) )
     fi
-}
+} &&
 complete -F _smbpasswd smbpasswd
 
 _smbtar()
@@ -251,7 +251,7 @@ _smbtar()
         COMPREPLY=( $( compgen -W '-r -i -a -v -s -p -x -X -N -b -d -l -u -t' \
             -- "$cur" ) )
     fi
-}
+} &&
 complete -F _smbtar smbtar
 
 _smbtree()
@@ -285,7 +285,7 @@ _smbtree()
             --log-basename -N -k -A --authentication-file -U --user\
             -h --help' -- "$cur" ) )
     fi
-}
+} &&
 complete -F _smbtree smbtree
 }
 
diff --git a/completions/smartctl b/completions/smartctl
index 2d7bdbea..3ce864ba 100644
--- a/completions/smartctl
+++ b/completions/smartctl
@@ -178,7 +178,7 @@ _smartctl()
         cur=${cur:=/dev/}
         _filedir
     fi
-}
+} &&
 complete -F _smartctl smartctl
 }
 
diff --git a/completions/ssh b/completions/ssh
index cf966ae5..e6802b73 100644
--- a/completions/ssh
+++ b/completions/ssh
@@ -190,7 +190,7 @@ _ssh()
     fi
 
     return 0
-}
+} &&
 shopt -u hostcomplete && complete -F _ssh ssh slogin autossh
 
 # sftp(1) completion
@@ -243,7 +243,7 @@ _sftp()
     fi
 
     return 0
-}
+} &&
 shopt -u hostcomplete && complete -F _sftp sftp
 
 # things we want to backslash escape in scp paths
@@ -389,7 +389,7 @@ _scp()
     _scp_local_files "$prefix"
 
     return 0
-}
+} &&
 complete -F _scp -o nospace scp
 
 # ssh-copy-id(1) completion
@@ -415,7 +415,7 @@ _ssh_copy_id()
     fi
 
     return 0
-}
+} &&
 complete -F _ssh_copy_id ssh-copy-id
 }
 
diff --git a/completions/update-alternatives b/completions/update-alternatives
index ebed294d..2dbd85e3 100644
--- a/completions/update-alternatives
+++ b/completions/update-alternatives
@@ -87,7 +87,7 @@ _update_alternatives()
                 --altdir --admindir --install --remove --auto --display \
                 --config --set' -- "$cur" ) )
     esac
-}
+} &&
 complete -F _update_alternatives update-alternatives alternatives
 }
 
diff --git a/completions/xm b/completions/xm
index f9f69a29..dede1b67 100644
--- a/completions/xm
+++ b/completions/xm
@@ -220,7 +220,7 @@ _xm()
     fi
 
     return 0
-}
+} &&
 complete -F _xm xm
 }