diff --git a/bash_completion b/bash_completion
index 6e297dc756f..b718df253b4 100644
--- a/bash_completion
+++ b/bash_completion
@@ -983,21 +983,21 @@ _comp_variable_assignments()
 #                     argument $2 is the string before the cursor in the
 #                     current word.  The third argument $3 is the previous
 #                     word.
-# @var[out] cur       Reconstructed current word
-# @var[out] prev      Reconstructed previous word
-# @var[out] words     Reconstructed words
-# @var[out] cword     Current word index in `words`
-# @var[out] comp_args Original arguments specified to the completion function
-#                     are saved in this array, if the arguments $1...$3 is
-#                     specified.
-# @var[out,opt] split When "-s" is specified, `true/false` is set depending on
-#                     whether the split happened.
+# @var[out] cur           Reconstructed current word
+# @var[out] prev          Reconstructed previous word
+# @var[out] words         Reconstructed words
+# @var[out] cword         Current word index in `words`
+# @var[out] comp_args     Original arguments specified to the completion function
+#                         are saved in this array, if the arguments $1...$3 is
+#                         specified.
+# @var[out,opt] was_split When "-s" is specified, `"set"/""` is set depending
+#                         on whether the split happened.
 # @return  True (0) if completion needs further processing,
 #          False (> 0) no further processing is necessary.
 #
 _comp_initialize()
 {
-    local exclude="" outx errx inx
+    local exclude="" opt_split="" outx errx inx
 
     local flag OPTIND=1 OPTARG="" OPTERR=0
     while getopts "n:e:o:i:s" flag "$@"; do
@@ -1007,7 +1007,8 @@ _comp_initialize()
             o) outx=$OPTARG ;;
             i) inx=$OPTARG ;;
             s)
-                split=false
+                opt_split="set"
+                was_split=""
                 exclude+="="
                 ;;
             *)
@@ -1065,7 +1066,7 @@ _comp_initialize()
     ((cword <= 0)) && return 1
     prev=${words[cword - 1]}
 
-    [[ ${split-} ]] && _split_longopt && split=true
+    [[ $opt_split ]] && _split_longopt && was_split="set"
 
     return 0
 }
@@ -2371,7 +2372,7 @@ _complete_as_root()
 
 _longopt()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case "${prev,,}" in
@@ -2402,7 +2403,7 @@ _longopt()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         _comp_compgen COMPREPLY -W "$(LC_ALL=C $1 --help 2>&1 |
diff --git a/bash_completion.d/000_bash_completion_compat.bash b/bash_completion.d/000_bash_completion_compat.bash
index ad5b6ab4025..d41d70c09f4 100644
--- a/bash_completion.d/000_bash_completion_compat.bash
+++ b/bash_completion.d/000_bash_completion_compat.bash
@@ -4,7 +4,6 @@ _comp_deprecate_func _userland _comp_userland
 _comp_deprecate_func _sysvdirs _comp_sysvdirs
 _comp_deprecate_func _have _comp_have_command
 _comp_deprecate_func _rl_enabled _comp_readline_variable_on
-_comp_deprecate_func _init_completion _comp_initialize
 _comp_deprecate_func _command_offset _comp_command_offset
 _comp_deprecate_func _command _comp_command
 _comp_deprecate_func _root_command _comp_root_command
@@ -178,6 +177,59 @@ _realcommand()
     return $rc
 }
 
+# Initialize completion and deal with various general things: do file
+# and variable completion where appropriate, and adjust prev, words,
+# and cword as if no redirections exist so that completions do not
+# need to deal with them.  Before calling this function, make sure
+# cur, prev, words, and cword are local, ditto split if you use -s.
+#
+# Options:
+#     -n EXCLUDE  Passed to _comp_get_words -n with redirection chars
+#     -e XSPEC    Passed to _filedir as first arg for stderr redirections
+#     -o XSPEC    Passed to _filedir as first arg for other output redirections
+#     -i XSPEC    Passed to _filedir as first arg for stdin redirections
+#     -s          Split long options with _split_longopt, implies -n =
+# @var[out] cur       Reconstructed current word
+# @var[out] prev      Reconstructed previous word
+# @var[out] words     Reconstructed words
+# @var[out] cword     Current word index in `words`
+# @var[out,opt] split When "-s" is specified, `"true"/"false"` is set depending
+#                     on whether the split happened.
+# @return  True (0) if completion needs further processing,
+#          False (> 0) no further processing is necessary.
+#
+# @deprecated Use the new interface `_comp_initialize`.  The new interface
+# supports the same set of options.  The new interface receives additional
+# arguments $1 (command name), $2 (part of current word before the cursor), and
+# $3 (previous word) that are specified to the completion function by Bash.
+# When `-s` is specified, instead of variable `split`, the new interface sets
+# variable `was_split` to the value "set"/"" when the split happened/not
+# happened.
+_init_completion()
+{
+    local was_split
+    _comp_initialize "$@"
+    local rc=$?
+
+    # When -s is specified, convert "split={set,}" to "split={true,false}"
+    local flag OPTIND=1 OPTARG="" OPTERR=0
+    while getopts "n:e:o:i:s" flag "$@"; do
+        case $flag in
+            [neoi]) ;;
+            s)
+                if [[ $was_split ]]; then
+                    split=true
+                else
+                    split=false
+                fi
+                break
+                ;;
+        esac
+    done
+
+    return "$rc"
+}
+
 # @deprecated Use the variable `_comp_backup_glob` instead.  This is the
 # backward-compatibility name.
 # shellcheck disable=SC2154  # defined in the main "bash_completion"
diff --git a/completions/2to3 b/completions/2to3
index 7f72176305c..f9d3be9d75a 100644
--- a/completions/2to3
+++ b/completions/2to3
@@ -2,7 +2,7 @@
 
 _2to3()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -24,7 +24,7 @@ _2to3()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/_mock b/completions/_mock
index 60f5dce1e7b..fea65ce8a30 100644
--- a/completions/_mock
+++ b/completions/_mock
@@ -5,7 +5,7 @@
 
 _comp_cmd_mock()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local plugins='tmpfs root_cache yum_cache bind_mount ccache'
@@ -55,7 +55,7 @@ _comp_cmd_mock()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/_repomanage b/completions/_repomanage
index abe1935a1d7..4f5388df07b 100644
--- a/completions/_repomanage
+++ b/completions/_repomanage
@@ -5,12 +5,12 @@
 
 _comp_cmd_repomanage()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     [[ $prev == -@([hk]|-help|-keep) ]] && return
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/_rtcwake b/completions/_rtcwake
index 79b5916278b..cd977b9da5e 100644
--- a/completions/_rtcwake
+++ b/completions/_rtcwake
@@ -5,7 +5,7 @@
 
 _comp_cmd_rtcwake()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case "$prev" in
@@ -24,7 +24,7 @@ _comp_cmd_rtcwake()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
 } &&
diff --git a/completions/_su b/completions/_su
index 2756b99e5b6..53838ec5f51 100644
--- a/completions/_su
+++ b/completions/_su
@@ -10,7 +10,7 @@ fi
 
 _comp_cmd_su()
 { # linux-specific completion
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case "$prev" in
@@ -26,7 +26,7 @@ _comp_cmd_su()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/_udevadm b/completions/_udevadm
index 2735627a6b0..0b207c1f1bf 100644
--- a/completions/_udevadm
+++ b/completions/_udevadm
@@ -5,7 +5,7 @@
 
 _comp_cmd_udevadm()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local i udevcmd has_udevcmd=""
@@ -52,7 +52,7 @@ _comp_cmd_udevadm()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ ! $has_udevcmd ]]; then
         case $cur in
diff --git a/completions/_yum b/completions/_yum
index 774c7f78a8e..88b58610db5 100644
--- a/completions/_yum
+++ b/completions/_yum
@@ -39,7 +39,7 @@ _yum_plugins()
 
 _comp_cmd_yum()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local special="" i
@@ -136,7 +136,7 @@ _comp_cmd_yum()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/a2x b/completions/a2x
index 245535721d2..014be3a78cb 100644
--- a/completions/a2x
+++ b/completions/a2x
@@ -2,7 +2,7 @@
 
 _a2x()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[aDd]*)'
@@ -26,7 +26,7 @@ _a2x()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1" --help)' -- "$cur"))
diff --git a/completions/aclocal b/completions/aclocal
index e9e4ef13c72..d4b9f4e3627 100644
--- a/completions/aclocal
+++ b/completions/aclocal
@@ -2,7 +2,7 @@
 
 _aclocal()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case "$prev" in
@@ -25,7 +25,7 @@ _aclocal()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
diff --git a/completions/add_members b/completions/add_members
index 7748794f842..6440423afa1 100644
--- a/completions/add_members
+++ b/completions/add_members
@@ -2,7 +2,7 @@
 
 _add_members()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -16,7 +16,7 @@ _add_members()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '--regular-members-file --digest-members-file
diff --git a/completions/appdata-validate b/completions/appdata-validate
index b583c61e5cf..99362a4633d 100644
--- a/completions/appdata-validate
+++ b/completions/appdata-validate
@@ -2,7 +2,7 @@
 
 _appdata_validate()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -17,7 +17,7 @@ _appdata_validate()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/apt-mark b/completions/apt-mark
index 14ad5b7a7b3..1d41af8e449 100644
--- a/completions/apt-mark
+++ b/completions/apt-mark
@@ -2,7 +2,7 @@
 
 _comp_cmd_apt_mark()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local special="" i
@@ -49,7 +49,7 @@ _comp_cmd_apt_mark()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '--file= --help --version --config-file
diff --git a/completions/arch b/completions/arch
index 478626a2be2..d9e698fb6f4 100644
--- a/completions/arch
+++ b/completions/arch
@@ -5,7 +5,7 @@
 _comp_have_command mailmanctl &&
     _arch()
     {
-        local cur prev words cword split comp_args
+        local cur prev words cword was_split comp_args
         _comp_initialize -s -- "$@" || return
 
         case $prev in
@@ -19,7 +19,7 @@ _comp_have_command mailmanctl &&
                 ;;
         esac
 
-        $split && return
+        [[ $was_split ]] && return
 
         if [[ $cur == -* ]]; then
             COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/asciidoc b/completions/asciidoc
index 1c8aedc8e97..51c60c5594c 100644
--- a/completions/asciidoc
+++ b/completions/asciidoc
@@ -9,7 +9,7 @@ _comp_deprecate_func _asciidoc_doctype _comp_xfunc_asciidoc_doctype
 
 _asciidoc()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[abfdo]*)'
@@ -40,7 +40,7 @@ _asciidoc()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1" "--help manpage")' \
diff --git a/completions/aspell b/completions/aspell
index bce45b3f0e9..0e4c1199c3b 100644
--- a/completions/aspell
+++ b/completions/aspell
@@ -18,7 +18,7 @@ _aspell_dictionary()
 
 _aspell()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -59,7 +59,7 @@ _aspell()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '--conf= --conf-dir= --data-dir= --dict-dir=
diff --git a/completions/autoconf b/completions/autoconf
index 17eaee82dad..d4d7cb203fa 100644
--- a/completions/autoconf
+++ b/completions/autoconf
@@ -2,7 +2,7 @@
 
 _autoconf()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case "$prev" in
@@ -25,7 +25,7 @@ _autoconf()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/automake b/completions/automake
index 46230144567..488dd009fc9 100644
--- a/completions/automake
+++ b/completions/automake
@@ -2,7 +2,7 @@
 
 _automake()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case "$prev" in
@@ -21,7 +21,7 @@ _automake()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/autoreconf b/completions/autoreconf
index 371d724d69b..c14c3a92692 100644
--- a/completions/autoreconf
+++ b/completions/autoreconf
@@ -2,7 +2,7 @@
 
 _autoreconf()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case "$prev" in
@@ -22,7 +22,7 @@ _autoreconf()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/autoscan b/completions/autoscan
index 5f5180ea1f9..61d5f9ad395 100644
--- a/completions/autoscan
+++ b/completions/autoscan
@@ -2,7 +2,7 @@
 
 _autoscan()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[BI]*)'
@@ -17,7 +17,7 @@ _autoscan()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/avahi-browse b/completions/avahi-browse
index d511c18c59f..cc45fefab5d 100644
--- a/completions/avahi-browse
+++ b/completions/avahi-browse
@@ -2,7 +2,7 @@
 
 _comp_cmd_avahi_browse()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[D]*)'
@@ -16,7 +16,7 @@ _comp_cmd_avahi_browse()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/bts b/completions/bts
index b6b0f2d4c93..710ff8f6218 100644
--- a/completions/bts
+++ b/completions/bts
@@ -19,7 +19,7 @@ _src_packages_with_prefix()
 
 _bts()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -90,7 +90,7 @@ _bts()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     COMPREPLY=($(compgen -W '--offline --online --no-offline
         --no-action --cache --no-cache --cache-mode --cache-delay --mbox
diff --git a/completions/carton b/completions/carton
index f79ed2b7a88..fd7b2221899 100644
--- a/completions/carton
+++ b/completions/carton
@@ -15,7 +15,7 @@ _carton_command_help()
 
 _carton()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local i command="" has_command=""
@@ -64,7 +64,7 @@ _carton()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         [[ $command == @(help|usage) ]] || COMPREPLY=(--help)
diff --git a/completions/ccache b/completions/ccache
index c6ff9606bd6..671a7dc7f6d 100644
--- a/completions/ccache
+++ b/completions/ccache
@@ -2,7 +2,7 @@
 
 _ccache()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local i
@@ -30,7 +30,7 @@ _ccache()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
diff --git a/completions/ccze b/completions/ccze
index 22bdaa004db..1011224308b 100644
--- a/completions/ccze
+++ b/completions/ccze
@@ -2,7 +2,7 @@
 
 _ccze()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[acFmop]*)'
@@ -36,7 +36,7 @@ _ccze()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
diff --git a/completions/chage b/completions/chage
index 82dea0e14a3..7d986399dc6 100644
--- a/completions/chage
+++ b/completions/chage
@@ -2,7 +2,7 @@
 
 _chage()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[dEImMWR]*)'
@@ -18,7 +18,7 @@ _chage()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/change_pw b/completions/change_pw
index df301609ced..aae085b9d8f 100644
--- a/completions/change_pw
+++ b/completions/change_pw
@@ -2,7 +2,7 @@
 
 _change_pw()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -12,7 +12,7 @@ _change_pw()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '--all --domain --listname --password --quiet
diff --git a/completions/checksec b/completions/checksec
index f1cb861b350..eb77e0e87b2 100644
--- a/completions/checksec
+++ b/completions/checksec
@@ -2,7 +2,7 @@
 
 _checksec()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -41,7 +41,7 @@ _checksec()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/chgrp b/completions/chgrp
index 21b3c87547e..01c75a37e27 100644
--- a/completions/chgrp
+++ b/completions/chgrp
@@ -2,7 +2,7 @@
 
 _chgrp()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     cur=${cur//\\\\/}
@@ -12,7 +12,7 @@ _chgrp()
         return
     fi
 
-    $split && return
+    [[ $was_split ]] && return
 
     # options completion
     if [[ $cur == -* ]]; then
diff --git a/completions/chkconfig b/completions/chkconfig
index 939a03d3201..73c1fb5d8cb 100644
--- a/completions/chkconfig
+++ b/completions/chkconfig
@@ -2,7 +2,7 @@
 
 _chkconfig()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -17,7 +17,7 @@ _chkconfig()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '--list --add --del --override --level' \
diff --git a/completions/chmod b/completions/chmod
index 967315e67ae..4c675955b03 100644
--- a/completions/chmod
+++ b/completions/chmod
@@ -2,7 +2,7 @@
 
 _chmod()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -15,7 +15,7 @@ _chmod()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     # Adapted from coreutils 8.28 chmod man page
     local modearg="-@(@(+([rwxXst])|[ugo])|+([0-7]))"
diff --git a/completions/chown b/completions/chown
index d2eec2d777e..eda2537b922 100644
--- a/completions/chown
+++ b/completions/chown
@@ -2,7 +2,7 @@
 
 _chown()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     # Don't treat user:group as separate words.
     _comp_initialize -s -n : -- "$@" || return
 
@@ -17,7 +17,7 @@ _chown()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         # Complete -options
diff --git a/completions/chpasswd b/completions/chpasswd
index c17a9b88b36..52c00a9e66e 100644
--- a/completions/chpasswd
+++ b/completions/chpasswd
@@ -2,7 +2,7 @@
 
 _chpasswd()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[csR]*)'
@@ -22,7 +22,7 @@ _chpasswd()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
diff --git a/completions/chromium-browser b/completions/chromium-browser
index dc64046025e..6ea5008dc66 100644
--- a/completions/chromium-browser
+++ b/completions/chromium-browser
@@ -2,7 +2,7 @@
 
 _chromium_browser()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -n : -- "$@" || return
 
     case $prev in
@@ -34,7 +34,7 @@ _chromium_browser()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/clone_member b/completions/clone_member
index 1aa674b3b8f..11a7c0b19fe 100644
--- a/completions/clone_member
+++ b/completions/clone_member
@@ -2,7 +2,7 @@
 
 _clone_member()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -12,7 +12,7 @@ _clone_member()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '--listname --remove --admin --quiet
diff --git a/completions/config_list b/completions/config_list
index e367ae968a4..358148d5ae2 100644
--- a/completions/config_list
+++ b/completions/config_list
@@ -2,7 +2,7 @@
 
 _config_list()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -12,7 +12,7 @@ _config_list()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '--inputfile --outputfile --checkonly
diff --git a/completions/configure b/completions/configure
index fa431304598..34af62a6200 100644
--- a/completions/configure
+++ b/completions/configure
@@ -2,7 +2,7 @@
 
 _configure()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -20,7 +20,7 @@ _configure()
             ;;
     esac
 
-    if $split || [[ $cur != -* ]]; then
+    if [[ $was_split || $cur != -* ]]; then
         _filedir
         return
     fi
diff --git a/completions/cpio b/completions/cpio
index c3c6d55eb1f..d1742cf8442 100644
--- a/completions/cpio
+++ b/completions/cpio
@@ -2,7 +2,7 @@
 
 _cpio()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -n : -- "$@" || return
 
     # --name value style option
@@ -29,7 +29,7 @@ _cpio()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if ((cword == 1)); then
         COMPREPLY=($(compgen -W '-o --create -i --extract -p --pass-through
diff --git a/completions/cppcheck b/completions/cppcheck
index aadee07763d..6a0153b23c7 100644
--- a/completions/cppcheck
+++ b/completions/cppcheck
@@ -2,7 +2,7 @@
 
 _cppcheck()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -17,16 +17,16 @@ _cppcheck()
             ;;
         --enable)
             # split comma-separated list
-            split=false
+            local split=""
             if [[ $cur == ?*,* ]]; then
                 prev="${cur%,*}"
                 cur="${cur##*,}"
-                split=true
+                split="set"
             fi
             COMPREPLY=($(compgen -W 'all warning style performance
                 portability information unusedFunction missingInclude' \
                 -- "$cur"))
-            $split && COMPREPLY=(${COMPREPLY[@]/#/"$prev,"})
+            [[ $split ]] && COMPREPLY=(${COMPREPLY[@]/#/"$prev,"})
             return
             ;;
         --error-exitcode)
@@ -62,7 +62,7 @@ _cppcheck()
             return
             ;;
         -rp | --relative-paths)
-            if $split; then # -rp without argument is allowed
+            if [[ $was_split ]]; then # -rp without argument is allowed
                 _filedir -d
                 return
             fi
@@ -77,7 +77,7 @@ _cppcheck()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/cryptsetup b/completions/cryptsetup
index 58c877b4965..07b0eb6ff61 100644
--- a/completions/cryptsetup
+++ b/completions/cryptsetup
@@ -13,7 +13,7 @@ _cryptsetup_device()
 
 _cryptsetup()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[cslSbopitTdM]*)'
@@ -33,7 +33,7 @@ _cryptsetup()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     local arg
     _get_first_arg
diff --git a/completions/deja-dup b/completions/deja-dup
index 877340bff56..da7a9a3d24e 100644
--- a/completions/deja-dup
+++ b/completions/deja-dup
@@ -2,7 +2,7 @@
 
 _comp_cmd_deja_dup()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -19,7 +19,7 @@ _comp_cmd_deja_dup()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1" --help-all)' -- "$cur"))
diff --git a/completions/dpkg b/completions/dpkg
index 92459018e91..75ed1e9ab8a 100644
--- a/completions/dpkg
+++ b/completions/dpkg
@@ -37,7 +37,7 @@ _comp_deprecate_func _comp_dpkg_purgeable_packages _comp_xfunc_dpkg_purgeable_pa
 #
 _comp_cmd_dpkg()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local i=$cword
@@ -113,7 +113,7 @@ _comp_cmd_dpkg()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     for i in ${!COMPREPLY[*]}; do
diff --git a/completions/ebtables b/completions/ebtables
index f80c9c53094..c16a92411dc 100644
--- a/completions/ebtables
+++ b/completions/ebtables
@@ -2,7 +2,7 @@
 
 _comp_cmd_ebtables()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local table chain='s/^Bridge chain: \([^ ,]\{1,\}\).*$/\1/p' \
diff --git a/completions/eog b/completions/eog
index 856fe8a83b2..dc60c313e1e 100644
--- a/completions/eog
+++ b/completions/eog
@@ -2,7 +2,7 @@
 
 _comp_cmd_eog()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -11,7 +11,7 @@ _comp_cmd_eog()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1" --help-all)' -- "$cur"))
diff --git a/completions/evince b/completions/evince
index 3276c452ca3..ea93f1de774 100644
--- a/completions/evince
+++ b/completions/evince
@@ -2,7 +2,7 @@
 
 _comp_cmd_evince()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[pil]*)'
@@ -19,7 +19,7 @@ _comp_cmd_evince()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1" --help-all)' -- "$cur"))
diff --git a/completions/faillog b/completions/faillog
index aa6307345aa..529200b3d5b 100644
--- a/completions/faillog
+++ b/completions/faillog
@@ -2,7 +2,7 @@
 
 _comp_cmd_faillog()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[lmtu]*)'
@@ -17,7 +17,7 @@ _comp_cmd_faillog()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/feh b/completions/feh
index 7caba9d315a..1e6ebf852f7 100644
--- a/completions/feh
+++ b/completions/feh
@@ -2,7 +2,7 @@
 
 _comp_cmd_feh()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[foO|KCjeM@TSRHWEyJabgLD~^]*)'
@@ -102,7 +102,7 @@ _comp_cmd_feh()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         # Some versions of feh just output "See 'man feh'" for --help :(
diff --git a/completions/file-roller b/completions/file-roller
index f0afced215f..6ab6d5ad744 100644
--- a/completions/file-roller
+++ b/completions/file-roller
@@ -2,7 +2,7 @@
 
 _comp_cmd_file_roller()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local exts='@(7z?(.001)|ace|alz|ar|arj|[bglx]z|bz2|tb?(z)2|cab|cb[rz]|iso?(9660)|Z|t[abglx]z|cpio|deb|rar|?(g)tar|gem|lh[az]|lz[4h]|?(t)lrz|lzma|lzo|wim|swm|rpm|sit|zoo|?(t)zst)'
@@ -28,7 +28,7 @@ _comp_cmd_file_roller()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1" --help-all)' -- "$cur"))
diff --git a/completions/find_member b/completions/find_member
index fbabc81336c..67c1a8267fd 100644
--- a/completions/find_member
+++ b/completions/find_member
@@ -2,7 +2,7 @@
 
 _comp_cmd_find_member()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -12,7 +12,7 @@ _comp_cmd_find_member()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '--listname --exclude --owners --help' \
diff --git a/completions/fio b/completions/fio
index 14a0d71e4ba..da19f5da728 100644
--- a/completions/fio
+++ b/completions/fio
@@ -9,7 +9,7 @@ _comp_cmd_fio__engines()
 
 _comp_cmd_fio()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local ret
@@ -137,7 +137,7 @@ _comp_cmd_fio()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(
diff --git a/completions/firefox b/completions/firefox
index 2df49cdeef0..193349886c8 100644
--- a/completions/firefox
+++ b/completions/firefox
@@ -2,7 +2,7 @@
 
 _comp_cmd_firefox()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     [[ $cur == -MOZ_LOG*=* ]] && prev=${cur%%=*} cur=${cur#*=}
@@ -38,7 +38,7 @@ _comp_cmd_firefox()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/flake8 b/completions/flake8
index 1402f85ca48..340420d0427 100644
--- a/completions/flake8
+++ b/completions/flake8
@@ -2,7 +2,7 @@
 
 _comp_cmd_flake8()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[j]*)'
@@ -29,7 +29,7 @@ _comp_cmd_flake8()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/getent b/completions/getent
index 7749b0da966..35cb0a181fa 100644
--- a/completions/getent
+++ b/completions/getent
@@ -2,7 +2,7 @@
 
 _comp_cmd_getent()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[s]*)'
@@ -64,7 +64,7 @@ _comp_cmd_getent()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/gnome-mplayer b/completions/gnome-mplayer
index 5093e9eb757..1d026588e8c 100644
--- a/completions/gnome-mplayer
+++ b/completions/gnome-mplayer
@@ -2,7 +2,7 @@
 
 _comp_cmd_gnome_mplayer()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -23,7 +23,7 @@ _comp_cmd_gnome_mplayer()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1" --help-all)' -- "$cur"))
diff --git a/completions/gnome-screenshot b/completions/gnome-screenshot
index 63872d29dab..48079e4d3b4 100644
--- a/completions/gnome-screenshot
+++ b/completions/gnome-screenshot
@@ -2,7 +2,7 @@
 
 _comp_cmd_gnome_screenshot()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[def]*)'
@@ -21,7 +21,7 @@ _comp_cmd_gnome_screenshot()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/gphoto2 b/completions/gphoto2
index 8927869ad5b..cbbf312c3d7 100644
--- a/completions/gphoto2
+++ b/completions/gphoto2
@@ -2,7 +2,7 @@
 
 _comp_cmd_gphoto2()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -n : -- "$@" || return
 
     case $prev in
@@ -42,7 +42,7 @@ _comp_cmd_gphoto2()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/gprof b/completions/gprof
index c877705ea83..3584868ba51 100644
--- a/completions/gprof
+++ b/completions/gprof
@@ -2,7 +2,7 @@
 
 _comp_cmd_gprof()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $cur in
@@ -41,7 +41,7 @@ _comp_cmd_gprof()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
diff --git a/completions/groupadd b/completions/groupadd
index fa153fb55a0..47b38e32861 100644
--- a/completions/groupadd
+++ b/completions/groupadd
@@ -2,7 +2,7 @@
 
 _comp_cmd_groupadd()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     # TODO: if -o/--non-unique is given, could complete on existing gids
@@ -16,7 +16,7 @@ _comp_cmd_groupadd()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/groupmod b/completions/groupmod
index 1624b0e322a..8f5ae3d7aae 100644
--- a/completions/groupmod
+++ b/completions/groupmod
@@ -2,7 +2,7 @@
 
 _comp_cmd_groupmod()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     # TODO: if -o/--non-unique is given, could complete on existing gids
@@ -16,7 +16,7 @@ _comp_cmd_groupmod()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/gssdp-discover b/completions/gssdp-discover
index 96677c6d95a..68d105495a8 100644
--- a/completions/gssdp-discover
+++ b/completions/gssdp-discover
@@ -2,7 +2,7 @@
 
 _comp_cmd_gssdp_discover()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
diff --git a/completions/hcitool b/completions/hcitool
index 14729f0a5a8..bf58bbf19b0 100644
--- a/completions/hcitool
+++ b/completions/hcitool
@@ -29,7 +29,7 @@ _bluetooth_packet_types()
 
 _hcitool()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -47,7 +47,7 @@ _hcitool()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     local arg
     _get_first_arg
@@ -109,7 +109,7 @@ _hcitool()
 
 _sdptool()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -119,7 +119,7 @@ _sdptool()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     local arg
     _get_first_arg
diff --git a/completions/hddtemp b/completions/hddtemp
index 299d15dcad8..3a20646fdcb 100644
--- a/completions/hddtemp
+++ b/completions/hddtemp
@@ -2,7 +2,7 @@
 
 _hddtemp()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[flupsS]*)'
@@ -25,7 +25,7 @@ _hddtemp()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1") --help' -- "$cur"))
diff --git a/completions/htop b/completions/htop
index 0b86baa3801..2b9b90d7672 100644
--- a/completions/htop
+++ b/completions/htop
@@ -2,7 +2,7 @@
 
 _htop()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[sud]*)'
@@ -22,7 +22,7 @@ _htop()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1" --help)' -- "$cur"))
diff --git a/completions/iconv b/completions/iconv
index 5f658d83514..b87010683dc 100644
--- a/completions/iconv
+++ b/completions/iconv
@@ -10,7 +10,7 @@ _comp_deprecate_func _iconv_charsets _comp_xfunc_iconv_charsets
 
 _iconv()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[fto]*)'
@@ -30,7 +30,7 @@ _iconv()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/idn b/completions/idn
index f5ca4858e3d..815aa610d23 100644
--- a/completions/idn
+++ b/completions/idn
@@ -2,7 +2,7 @@
 
 _idn()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[p]*)'
@@ -18,7 +18,7 @@ _idn()
             ;;
     esac
 
-    if ! $split && [[ $cur == -* ]]; then
+    if [[ ! $was_split && $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
diff --git a/completions/ifstat b/completions/ifstat
index cafca7780b9..a0eee47f811 100644
--- a/completions/ifstat
+++ b/completions/ifstat
@@ -2,7 +2,7 @@
 
 _ifstat()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[idstx]*)'
@@ -56,7 +56,7 @@ _ifstat()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(
diff --git a/completions/info b/completions/info
index eff2bea0d6e..19e054372c2 100644
--- a/completions/info
+++ b/completions/info
@@ -2,7 +2,7 @@
 
 _info()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     # default completion if parameter looks like a path
@@ -33,7 +33,7 @@ _info()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/inject b/completions/inject
index 9dce9ee4125..ceff928cf48 100644
--- a/completions/inject
+++ b/completions/inject
@@ -2,7 +2,7 @@
 
 _inject()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -12,7 +12,7 @@ _inject()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '--listname --queue --help' -- "$cur"))
diff --git a/completions/interdiff b/completions/interdiff
index c3d6bbba57e..53abb9f1b6c 100644
--- a/completions/interdiff
+++ b/completions/interdiff
@@ -2,7 +2,7 @@
 
 _interdiff()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[Upd]*)'
@@ -13,7 +13,7 @@ _interdiff()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/iperf b/completions/iperf
index bfa9a5a756d..d09d94e47e7 100644
--- a/completions/iperf
+++ b/completions/iperf
@@ -2,7 +2,7 @@
 
 _iperf()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -n : -- "$@" || return
 
     local noargopts='!(-*|*[ilpwMXbntLPTZCkOSAfIoFBcxy]*)'
@@ -66,7 +66,7 @@ _iperf()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     # Filter mode specific options
     local i filter=cat
diff --git a/completions/iptables b/completions/iptables
index 3273793102d..509deedb0cd 100644
--- a/completions/iptables
+++ b/completions/iptables
@@ -2,7 +2,7 @@
 
 _iptables()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local table chain='s/^Chain \([^ ]\{1,\}\).*$/\1/p'
diff --git a/completions/ipv6calc b/completions/ipv6calc
index 9aec281e87a..f7175a14ec9 100644
--- a/completions/ipv6calc
+++ b/completions/ipv6calc
@@ -2,7 +2,7 @@
 
 _ipv6calc()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[dIOA]*)'
@@ -27,7 +27,7 @@ _ipv6calc()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$("$1" -h 2>&1 |
diff --git a/completions/iscsiadm b/completions/iscsiadm
index ad47d3e1af6..100f4911401 100644
--- a/completions/iscsiadm
+++ b/completions/iscsiadm
@@ -2,7 +2,7 @@
 
 _iscsiadm()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[motLU]*)'
@@ -27,7 +27,7 @@ _iscsiadm()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     local options
     if ((cword > 1)); then
diff --git a/completions/jpegoptim b/completions/jpegoptim
index 17d6d694fd2..a985710d825 100644
--- a/completions/jpegoptim
+++ b/completions/jpegoptim
@@ -2,7 +2,7 @@
 
 _jpegoptim()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[dmTS]*)'
@@ -25,7 +25,7 @@ _jpegoptim()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/jshint b/completions/jshint
index 53ad9ab626f..e46940a6b90 100644
--- a/completions/jshint
+++ b/completions/jshint
@@ -2,7 +2,7 @@
 
 _jshint()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -23,7 +23,7 @@ _jshint()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/kcov b/completions/kcov
index 0affe1d5ded..32c67dd839b 100644
--- a/completions/kcov
+++ b/completions/kcov
@@ -2,7 +2,7 @@
 
 _comp_cmd_kcov()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -n : -- "$@" || return
 
     case "$prev" in
@@ -49,7 +49,7 @@ _comp_cmd_kcov()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1" --help)' -- "$cur"))
diff --git a/completions/killall b/completions/killall
index e699400da0a..38438f29908 100644
--- a/completions/killall
+++ b/completions/killall
@@ -4,7 +4,7 @@
 
 _comp_cmd_killall()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[Zoysu]*)'
@@ -23,7 +23,7 @@ _comp_cmd_killall()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/koji b/completions/koji
index 20384e6f5c2..f860811d7d1 100644
--- a/completions/koji
+++ b/completions/koji
@@ -34,7 +34,7 @@ _comp_cmd_koji__target()
 
 _comp_cmd_koji()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local commandix command="" has_command=""
@@ -106,7 +106,7 @@ _comp_cmd_koji()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $has_command ]]; then
         if [[ $cur == -* ]]; then
diff --git a/completions/ktutil b/completions/ktutil
index 22c7533438b..01a031f994b 100644
--- a/completions/ktutil
+++ b/completions/ktutil
@@ -21,7 +21,7 @@ _comp_cmd_ktutil__heimdal_encodings()
 
 _comp_cmd_ktutil()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local command commands i options
@@ -49,7 +49,7 @@ _comp_cmd_ktutil()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     commands='add change copy get list remove rename purge srvconvert
         srv2keytab srvcreate key2srvtab'
diff --git a/completions/lastlog b/completions/lastlog
index 6c0c8000023..cb89b7902e4 100644
--- a/completions/lastlog
+++ b/completions/lastlog
@@ -2,7 +2,7 @@
 
 _comp_cmd_lastlog()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[btu]*)'
@@ -17,7 +17,7 @@ _comp_cmd_lastlog()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
diff --git a/completions/list_members b/completions/list_members
index 2c35175f1fd..9def46d2bb7 100644
--- a/completions/list_members
+++ b/completions/list_members
@@ -2,7 +2,7 @@
 
 _comp_cmd_list_members()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -21,7 +21,7 @@ _comp_cmd_list_members()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '--output --regular --digest --nomail
diff --git a/completions/locale-gen b/completions/locale-gen
index 663f549e139..31188e71876 100644
--- a/completions/locale-gen
+++ b/completions/locale-gen
@@ -2,7 +2,7 @@
 
 _comp_cmd_locale_gen()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -15,7 +15,7 @@ _comp_cmd_locale_gen()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/lsscsi b/completions/lsscsi
index 294e91f7a67..2ea2161e69a 100644
--- a/completions/lsscsi
+++ b/completions/lsscsi
@@ -2,7 +2,7 @@
 
 _comp_cmd_lsscsi()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[y]*)'
@@ -17,7 +17,7 @@ _comp_cmd_lsscsi()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/luseradd b/completions/luseradd
index f5f2a47ed12..db36d94b6b0 100644
--- a/completions/luseradd
+++ b/completions/luseradd
@@ -2,7 +2,7 @@
 
 _comp_cmd_luseradd()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[culPpdksg]*)'
@@ -27,7 +27,7 @@ _comp_cmd_luseradd()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/lzip b/completions/lzip
index 28172fdd683..7a7f5f17da5 100644
--- a/completions/lzip
+++ b/completions/lzip
@@ -2,7 +2,7 @@
 
 _comp_cmd_lzip()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local decompress=""
@@ -27,7 +27,7 @@ _comp_cmd_lzip()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1") {-1..-9}' -- "$cur"))
diff --git a/completions/lzma b/completions/lzma
index a7b13772b82..3b267b57766 100644
--- a/completions/lzma
+++ b/completions/lzma
@@ -3,10 +3,10 @@
 
 _comp_cmd_lzma()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1") -{1..9}' -- "$cur"))
diff --git a/completions/make b/completions/make
index aa87eeb0fdc..595c1bb72ea 100644
--- a/completions/make
+++ b/completions/make
@@ -139,7 +139,7 @@ _comp_make__truncate_non_unique_paths()
 
 _make()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local makef makef_dir=("-C" ".") i
@@ -169,7 +169,7 @@ _make()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(
diff --git a/completions/man b/completions/man
index b55af43fce0..ba2b60a9241 100644
--- a/completions/man
+++ b/completions/man
@@ -2,7 +2,7 @@
 
 _man()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -n : -- "$@" || return
 
     local comprsuffix=".@([glx]z|bz2|lzma|Z|zst)"
@@ -43,7 +43,7 @@ _man()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(
diff --git a/completions/mc b/completions/mc
index 88a6cbd2e57..ec5018bbb4f 100644
--- a/completions/mc
+++ b/completions/mc
@@ -2,7 +2,7 @@
 
 _mc()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[evlPCD]*)'
@@ -17,7 +17,7 @@ _mc()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1" --help-all)' -- "$cur"))
diff --git a/completions/mdadm b/completions/mdadm
index b5ff53cb1f8..54d01d2e0cf 100644
--- a/completions/mdadm
+++ b/completions/mdadm
@@ -71,7 +71,7 @@ _mdadm_update_flag()
 
 _mdadm()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[cblpaU]*)'
@@ -99,7 +99,7 @@ _mdadm()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     local options='--help --help-options --version --verbose --quiet --brief
         --force --config= --scan --metadata= --homehost='
diff --git a/completions/mii-diag b/completions/mii-diag
index f36401284f5..fa7d49f184e 100644
--- a/completions/mii-diag
+++ b/completions/mii-diag
@@ -2,7 +2,7 @@
 
 _mii_diag()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -13,7 +13,7 @@ _mii_diag()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/mii-tool b/completions/mii-tool
index adb490c3b00..17f20e56395 100644
--- a/completions/mii-tool
+++ b/completions/mii-tool
@@ -2,7 +2,7 @@
 
 _mii_tool()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[FA]*)'
@@ -20,7 +20,7 @@ _mii_tool()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/minicom b/completions/minicom
index 924d393341f..6277df57f8a 100644
--- a/completions/minicom
+++ b/completions/minicom
@@ -2,7 +2,7 @@
 
 _minicom()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[acSCp]*)'
@@ -25,7 +25,7 @@ _minicom()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/mkinitrd b/completions/mkinitrd
index dd52adad7fa..317e593ee5e 100644
--- a/completions/mkinitrd
+++ b/completions/mkinitrd
@@ -2,7 +2,7 @@
 
 _mkinitrd()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -20,7 +20,7 @@ _mkinitrd()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '--version --help -v -f --preload \
diff --git a/completions/mktemp b/completions/mktemp
index 0d478f34df6..4afb91278f5 100644
--- a/completions/mktemp
+++ b/completions/mktemp
@@ -2,7 +2,7 @@
 
 _mktemp()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[p]*)'
@@ -17,7 +17,7 @@ _mktemp()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         local opts=$(_parse_help "$1")
diff --git a/completions/modinfo b/completions/modinfo
index 259bdebd65a..73a950b7d20 100644
--- a/completions/modinfo
+++ b/completions/modinfo
@@ -2,7 +2,7 @@
 
 _modinfo()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[Fkb]*)'
@@ -25,7 +25,7 @@ _modinfo()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(
diff --git a/completions/modprobe b/completions/modprobe
index 132f0f03e71..f6beeb34abd 100644
--- a/completions/modprobe
+++ b/completions/modprobe
@@ -2,7 +2,7 @@
 
 _modprobe()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[CdtS]*)'
@@ -25,7 +25,7 @@ _modprobe()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/monodevelop b/completions/monodevelop
index 2ef1939d7ec..c830f91a564 100644
--- a/completions/monodevelop
+++ b/completions/monodevelop
@@ -2,10 +2,10 @@
 
 _monodevelop()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
diff --git a/completions/mypy b/completions/mypy
index dbe14551735..bfd57511f7e 100644
--- a/completions/mypy
+++ b/completions/mypy
@@ -2,7 +2,7 @@
 
 _mypy()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     [[ $cword -gt 2 && ${words[cword - 2]} == --shadow-file ]] &&
@@ -46,7 +46,7 @@ _mypy()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/mysql b/completions/mysql
index 416df2d91e5..61c8b3d8288 100644
--- a/completions/mysql
+++ b/completions/mysql
@@ -15,7 +15,7 @@ _comp_deprecate_func _mysql_character_sets _comp_xfunc_mysql_character_sets
 
 _mysql()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[uDhSPeI]*)'
@@ -74,7 +74,7 @@ _mysql()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     case $cur in
         --*)
diff --git a/completions/mysqladmin b/completions/mysqladmin
index 354e0f508d5..1699d6fdd19 100644
--- a/completions/mysqladmin
+++ b/completions/mysqladmin
@@ -2,7 +2,7 @@
 
 _mysqladmin()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[uhScPOiw]*)'
@@ -49,7 +49,7 @@ _mysqladmin()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
 
diff --git a/completions/newlist b/completions/newlist
index 18609d6a1c5..23f428adea4 100644
--- a/completions/newlist
+++ b/completions/newlist
@@ -2,7 +2,7 @@
 
 _newlist()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -11,7 +11,7 @@ _newlist()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/newusers b/completions/newusers
index 983810d1f1a..32da0f5fcd8 100644
--- a/completions/newusers
+++ b/completions/newusers
@@ -2,7 +2,7 @@
 
 _newusers()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -15,7 +15,7 @@ _newusers()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/nmap b/completions/nmap
index a92df0f3a1b..66acd7e0e1d 100644
--- a/completions/nmap
+++ b/completions/nmap
@@ -2,7 +2,7 @@
 
 _nmap()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -24,7 +24,7 @@ _nmap()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         # strip everything following a :, inclusive
diff --git a/completions/nproc b/completions/nproc
index 1807fd93946..3e4c059028a 100644
--- a/completions/nproc
+++ b/completions/nproc
@@ -2,7 +2,7 @@
 
 _nproc()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -11,7 +11,7 @@ _nproc()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/oggdec b/completions/oggdec
index b9f186a7229..02e917d57f4 100644
--- a/completions/oggdec
+++ b/completions/oggdec
@@ -2,7 +2,7 @@
 
 _oggdec()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[beso]*)'
@@ -25,7 +25,7 @@ _oggdec()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/pack200 b/completions/pack200
index 66dc9d4e977..67474262c8f 100644
--- a/completions/pack200
+++ b/completions/pack200
@@ -2,7 +2,7 @@
 
 _pack200()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -42,7 +42,7 @@ _pack200()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     # Check if a pack or a jar was already given.
     local i pack="" jar=""
diff --git a/completions/patch b/completions/patch
index e045001edce..85f19c5d82d 100644
--- a/completions/patch
+++ b/completions/patch
@@ -2,7 +2,7 @@
 
 _patch()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[pDBYzgFiorVd]*)'
@@ -48,7 +48,7 @@ _patch()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/pkg-config b/completions/pkg-config
index 3c55bd187de..d5c956b1e10 100644
--- a/completions/pkg-config
+++ b/completions/pkg-config
@@ -2,7 +2,7 @@
 
 _pkg_config()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -29,7 +29,7 @@ _pkg_config()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/pngfix b/completions/pngfix
index ab0f2089429..610636fa9a9 100644
--- a/completions/pngfix
+++ b/completions/pngfix
@@ -2,7 +2,7 @@
 
 _pngfix()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -21,7 +21,7 @@ _pngfix()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/prelink b/completions/prelink
index 1293f331ed1..33b214dd334 100644
--- a/completions/prelink
+++ b/completions/prelink
@@ -2,7 +2,7 @@
 
 _prelink()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -27,7 +27,7 @@ _prelink()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/protoc b/completions/protoc
index e0825233a05..a822b04063c 100644
--- a/completions/protoc
+++ b/completions/protoc
@@ -2,7 +2,7 @@
 
 _protoc()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -30,7 +30,7 @@ _protoc()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     case $cur in
         -o*)
diff --git a/completions/psql b/completions/psql
index da654f27dd8..e3adda2626f 100644
--- a/completions/psql
+++ b/completions/psql
@@ -20,7 +20,7 @@ _pg_users()
 #
 _createdb()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[hUOpDET]*)'
@@ -40,7 +40,7 @@ _createdb()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
@@ -55,7 +55,7 @@ _createdb()
 #
 _createuser()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[pchU]*)'
@@ -74,7 +74,7 @@ _createuser()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
@@ -87,7 +87,7 @@ _createuser()
 #
 _dropdb()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[hU]*)'
@@ -106,7 +106,7 @@ _dropdb()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
@@ -121,7 +121,7 @@ _dropdb()
 #
 _dropuser()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[phU]*)'
@@ -140,7 +140,7 @@ _dropuser()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
@@ -155,7 +155,7 @@ _dropuser()
 #
 _psql()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[hUdofLcFpPRTv]*)'
@@ -184,7 +184,7 @@ _psql()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         # return list of available options
diff --git a/completions/pwgen b/completions/pwgen
index f256fc63700..d93c528ed0c 100644
--- a/completions/pwgen
+++ b/completions/pwgen
@@ -2,7 +2,7 @@
 
 _pwgen()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[NH]*)'
@@ -17,7 +17,7 @@ _pwgen()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/pycodestyle b/completions/pycodestyle
index c2466bddc0c..bc31d3be571 100644
--- a/completions/pycodestyle
+++ b/completions/pycodestyle
@@ -2,7 +2,7 @@
 
 _pycodestyle()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -19,7 +19,7 @@ _pycodestyle()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/pydocstyle b/completions/pydocstyle
index 5dae7479836..87c93fdf165 100644
--- a/completions/pydocstyle
+++ b/completions/pydocstyle
@@ -2,7 +2,7 @@
 
 _pydocstyle()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -20,7 +20,7 @@ _pydocstyle()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/pylint b/completions/pylint
index 67cfc4d0ffa..0d415dbc409 100644
--- a/completions/pylint
+++ b/completions/pylint
@@ -21,7 +21,7 @@ _comp_cmd_pylint_message_ids()
 
 _pylint()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local python=python
@@ -100,7 +100,7 @@ _pylint()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W \
diff --git a/completions/pytest b/completions/pytest
index 3a1ecb87b3d..661454910be 100644
--- a/completions/pytest
+++ b/completions/pytest
@@ -10,7 +10,7 @@ _pytest_option_choice_args()
 
 _pytest()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -n : -- "$@" || return
 
     local noargopts='!(-*|*[kmorpcWn]*)'
@@ -93,7 +93,7 @@ _pytest()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/pyvenv b/completions/pyvenv
index 730daee36fc..4bcba048932 100644
--- a/completions/pyvenv
+++ b/completions/pyvenv
@@ -2,7 +2,7 @@
 
 _pyvenv()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -11,7 +11,7 @@ _pyvenv()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         _longopt "$@"
diff --git a/completions/qrunner b/completions/qrunner
index 3eaa8522ed1..61d1a60cd37 100644
--- a/completions/qrunner
+++ b/completions/qrunner
@@ -2,10 +2,10 @@
 
 _qrunner()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '--runner --once --list --verbose --subproc
diff --git a/completions/querybts b/completions/querybts
index 4d68d384726..d705a92968b 100644
--- a/completions/querybts
+++ b/completions/querybts
@@ -2,7 +2,7 @@
 
 _querybts()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[Bu]*)'
@@ -24,7 +24,7 @@ _querybts()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/quota b/completions/quota
index e0c06608a61..b790c6442df 100644
--- a/completions/quota
+++ b/completions/quota
@@ -39,7 +39,7 @@ _filesystems()
 
 _quota()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -52,7 +52,7 @@ _quota()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         _quota_parse_help "$1"
@@ -64,7 +64,7 @@ _quota()
 
 _setquota()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -81,7 +81,7 @@ _setquota()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         _quota_parse_help "$1"
@@ -104,7 +104,7 @@ _setquota()
 
 _edquota()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -125,7 +125,7 @@ _edquota()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         _quota_parse_help "$1"
@@ -137,7 +137,7 @@ _edquota()
 
 _quotacheck()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -150,7 +150,7 @@ _quotacheck()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         _quota_parse_help "$1"
@@ -162,7 +162,7 @@ _quotacheck()
 
 _quotaon()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -179,7 +179,7 @@ _quotaon()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         _quota_parse_help "$1"
diff --git a/completions/remove_members b/completions/remove_members
index 581c47b2662..8b57f63149e 100644
--- a/completions/remove_members
+++ b/completions/remove_members
@@ -2,7 +2,7 @@
 
 _remove_members()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -12,7 +12,7 @@ _remove_members()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '--file --all --fromall --nouserack
diff --git a/completions/reportbug b/completions/reportbug
index b4364616c55..55adbe249ae 100644
--- a/completions/reportbug
+++ b/completions/reportbug
@@ -2,7 +2,7 @@
 
 _reportbug()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[CefKHPsoiATjVuQtBS]*)'
@@ -57,7 +57,7 @@ _reportbug()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/ri b/completions/ri
index 343bc3165c3..744434bacdb 100644
--- a/completions/ri
+++ b/completions/ri
@@ -35,7 +35,7 @@ _ri_get_methods()
 # needs at least Ruby 1.8.0 in order to use -W0
 _ri()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -n : -- "$@" || return
 
     local noargopts='!(-*|*[wfd]*)'
@@ -58,7 +58,7 @@ _ri()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/rpm b/completions/rpm
index 106f047ccb2..ca4052d7bb3 100644
--- a/completions/rpm
+++ b/completions/rpm
@@ -47,7 +47,7 @@ _rpm_buildarchs()
 #
 _rpm()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     if ((cword == 1)); then
@@ -119,7 +119,7 @@ _rpm()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     # options common to all modes
     local -a opts=(
@@ -241,7 +241,7 @@ _rpm()
 
 _rpmbuild()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local rpm="${1%build*}"
@@ -278,7 +278,7 @@ _rpmbuild()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W "$(_parse_help "$1")" -- "$cur"))
diff --git a/completions/rsync b/completions/rsync
index 4a69c146544..04119e05507 100644
--- a/completions/rsync
+++ b/completions/rsync
@@ -2,7 +2,7 @@
 
 _rsync()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -n : -- "$@" || return
 
     local noargopts='!(-*|*[Te]*)'
@@ -54,7 +54,7 @@ _rsync()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     _expand || return
 
diff --git a/completions/scrub b/completions/scrub
index 91ee105d51f..a96c5a56871 100644
--- a/completions/scrub
+++ b/completions/scrub
@@ -2,7 +2,7 @@
 
 _scrub()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[bsDpX]*)'
@@ -24,7 +24,7 @@ _scrub()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/secret-tool b/completions/secret-tool
index 1be538cc339..77e0b73c815 100644
--- a/completions/secret-tool
+++ b/completions/secret-tool
@@ -2,10 +2,10 @@
 
 _secret_tool()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
-    $split && return
+    [[ $was_split ]] && return
 
     local -i i
     local mode="" has_mode="" word
diff --git a/completions/sha256sum b/completions/sha256sum
index 69c76a95da7..c6b94433c72 100644
--- a/completions/sha256sum
+++ b/completions/sha256sum
@@ -2,7 +2,7 @@
 
 _comp_cmd_sha256sum()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -11,7 +11,7 @@ _comp_cmd_sha256sum()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         _longopt "$@"
diff --git a/completions/shellcheck b/completions/shellcheck
index 0f9e19f73db..fb1d6de986a 100644
--- a/completions/shellcheck
+++ b/completions/shellcheck
@@ -9,7 +9,7 @@ _shellcheck_optarg()
 
 _shellcheck()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[eifCsoPW]*)'
@@ -50,7 +50,7 @@ _shellcheck()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/sitecopy b/completions/sitecopy
index c889b3b2438..6f8ff4ce4c0 100644
--- a/completions/sitecopy
+++ b/completions/sitecopy
@@ -5,7 +5,7 @@
 
 _sitecopy()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[dgrp]*)'
diff --git a/completions/slapt-src b/completions/slapt-src
index 03de909eb22..0257f1ea191 100644
--- a/completions/slapt-src
+++ b/completions/slapt-src
@@ -2,7 +2,7 @@
 
 _slapt_src()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -n : -- "$@" || return
 
     case "$prev" in
@@ -16,7 +16,7 @@ _slapt_src()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1" --help)' -- "$cur"))
diff --git a/completions/smartctl b/completions/smartctl
index c1cd5fb3524..b1358cf8971 100644
--- a/completions/smartctl
+++ b/completions/smartctl
@@ -93,7 +93,7 @@ _smartctl_drivedb()
 
 _smartctl()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[qdTbrnsoSlvFPBt]*)'
@@ -152,7 +152,7 @@ _smartctl()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/smbclient b/completions/smbclient
index f2ecb7a4ec4..4be8661dd7a 100644
--- a/completions/smbclient
+++ b/completions/smbclient
@@ -41,7 +41,7 @@ _samba_signing()
 
 _smbclient()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[RtsAlDOTWdLSpMIbUniTcm]*)'
@@ -98,7 +98,7 @@ _smbclient()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
@@ -109,7 +109,7 @@ _smbclient()
 
 _smbget()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[ofdwupb]*)'
@@ -132,7 +132,7 @@ _smbget()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
@@ -143,7 +143,7 @@ _smbget()
 
 _smbcacls()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[AsldOWDMaSCGniU]*)'
@@ -179,7 +179,7 @@ _smbcacls()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
@@ -190,7 +190,7 @@ _smbcacls()
 
 _smbcquotas()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[sAldUuS]*)'
@@ -217,7 +217,7 @@ _smbcquotas()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
@@ -294,7 +294,7 @@ _smbtar()
 
 _smbtree()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[sAldSU]*)'
@@ -321,7 +321,7 @@ _smbtree()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/ss b/completions/ss
index 0a49123bd97..840bb73836b 100644
--- a/completions/ss
+++ b/completions/ss
@@ -2,7 +2,7 @@
 
 _ss()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[fADF]*)'
@@ -27,7 +27,7 @@ _ss()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/strings b/completions/strings
index f3afd6155a8..dca094f2e89 100644
--- a/completions/strings
+++ b/completions/strings
@@ -2,7 +2,7 @@
 
 _strings()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[nstTe]*)'
@@ -33,7 +33,7 @@ _strings()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         # macOS: ... [-t format] [-number] [-n number] ...
diff --git a/completions/sudo b/completions/sudo
index 691105e9a22..a6940fac700 100644
--- a/completions/sudo
+++ b/completions/sudo
@@ -2,7 +2,7 @@
 
 _sudo()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local i mode=normal
@@ -42,7 +42,7 @@ _sudo()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(
diff --git a/completions/sync_members b/completions/sync_members
index f69c65d1f5a..6e94fcc27e4 100644
--- a/completions/sync_members
+++ b/completions/sync_members
@@ -2,7 +2,7 @@
 
 _sync_members()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -16,7 +16,7 @@ _sync_members()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '--no-change --welcome-msg --goodbye-msg
diff --git a/completions/sysbench b/completions/sysbench
index afa6261864c..b98b2a2d25f 100644
--- a/completions/sysbench
+++ b/completions/sysbench
@@ -2,7 +2,7 @@
 
 _sysbench()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -100,7 +100,7 @@ _sysbench()
             return
             ;;
         --*)
-            $split && return
+            [[ $was_split ]] && return
             ;;
     esac
 
diff --git a/completions/tar b/completions/tar
index b826a36e1a7..a02ef8451f0 100644
--- a/completions/tar
+++ b/completions/tar
@@ -502,7 +502,7 @@ _gtar()
         local PS4='$BASH_SOURCE:$LINENO: '
     fi
 
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
 
     _comp_initialize -s -- "$@" || return
 
@@ -602,7 +602,7 @@ _gtar()
                 # if there is some unknown option with '=', for example
                 # (literally) user does --nonexistent=<TAB>, we do not want
                 # continue also
-                $split && break
+                [[ $was_split ]] && break
 
                 # Most probably, when code goes here, the PREV variable contains
                 # some string from "$long_arg_none" and we want continue.
@@ -686,7 +686,7 @@ _posix_tar()
     # The mode argument, e.g. -cpf or -c
     local tar_mode_arg=
 
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
 
     _comp_initialize -s -- "$@" || return
 
diff --git a/completions/tcpdump b/completions/tcpdump
index 987bf392712..b8df1cc8ed6 100644
--- a/completions/tcpdump
+++ b/completions/tcpdump
@@ -2,7 +2,7 @@
 
 _tcpdump()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[rwFVimTzZBcCDEGMsWyjQ]*)'
@@ -53,7 +53,7 @@ _tcpdump()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
diff --git a/completions/timeout b/completions/timeout
index 98e51adb5c7..3b2cad5ee89 100644
--- a/completions/timeout
+++ b/completions/timeout
@@ -2,7 +2,7 @@
 
 _timeout()
 {
-    local cur prev words cword split comp_args i found=""
+    local cur prev words cword was_split comp_args i found=""
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[ks]*)'
@@ -29,7 +29,7 @@ _timeout()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(
diff --git a/completions/tree b/completions/tree
index 3a8b528c313..066e982def2 100644
--- a/completions/tree
+++ b/completions/tree
@@ -2,7 +2,7 @@
 
 _comp_cmd_tree()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[LPIHTo]*)'
@@ -25,7 +25,7 @@ _comp_cmd_tree()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/truncate b/completions/truncate
index ff2d00636a4..542cc1a9796 100644
--- a/completions/truncate
+++ b/completions/truncate
@@ -2,7 +2,7 @@
 
 _comp_cmd_truncate()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[sr]*)'
@@ -17,7 +17,7 @@ _comp_cmd_truncate()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/unpack200 b/completions/unpack200
index b3d4708c01d..097307dac73 100644
--- a/completions/unpack200
+++ b/completions/unpack200
@@ -2,7 +2,7 @@
 
 _unpack200()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[Hl]*)'
@@ -22,7 +22,7 @@ _unpack200()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     # Check if a pack or a jar was already given.
     local word pack="" jar=""
diff --git a/completions/uscan b/completions/uscan
index c8b8c9cc714..004d591ae74 100644
--- a/completions/uscan
+++ b/completions/uscan
@@ -2,7 +2,7 @@
 
 _uscan()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -25,7 +25,7 @@ _uscan()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
 } &&
diff --git a/completions/useradd b/completions/useradd
index d2ec6fdc6b3..04ff7bf7ab1 100644
--- a/completions/useradd
+++ b/completions/useradd
@@ -2,7 +2,7 @@
 
 _useradd()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     # TODO: if -o/--non-unique is given, could complete on existing uids
@@ -49,7 +49,7 @@ _useradd()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     [[ $cur == -* ]] &&
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/usermod b/completions/usermod
index 8938e339ca2..cb5ca13d422 100644
--- a/completions/usermod
+++ b/completions/usermod
@@ -2,7 +2,7 @@
 
 _usermod()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     # TODO: if -o/--non-unique is given, could complete on existing uids
@@ -49,7 +49,7 @@ _usermod()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         # TODO: -U/--unlock, -p/--password, -L/--lock mutually exclusive
diff --git a/completions/valgrind b/completions/valgrind
index 47d92650273..5d5369bfdfb 100644
--- a/completions/valgrind
+++ b/completions/valgrind
@@ -2,7 +2,7 @@
 
 _valgrind()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local i
@@ -101,7 +101,7 @@ _valgrind()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1" "--help ${tool-}")' \
diff --git a/completions/watch b/completions/watch
index 3850878d8e6..8528037e56d 100644
--- a/completions/watch
+++ b/completions/watch
@@ -4,7 +4,7 @@
 
 _watch()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local offset=0 i
@@ -44,7 +44,7 @@ _watch()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/wget b/completions/wget
index 8d340aed5c4..3bc8be4170b 100644
--- a/completions/wget
+++ b/completions/wget
@@ -2,7 +2,7 @@
 
 _wget()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[DPoaOitTwlQeBUARIX]*)'
@@ -166,7 +166,7 @@ _wget()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/wol b/completions/wol
index 32e37c8e120..513ac94c9e9 100644
--- a/completions/wol
+++ b/completions/wol
@@ -2,7 +2,7 @@
 
 _wol()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -n : -- "$@" || return
 
     local noargopts='!(-*|*[pwhif]*)'
@@ -30,7 +30,7 @@ _wol()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/wvdial b/completions/wvdial
index b57d319c742..477fbcc90ea 100644
--- a/completions/wvdial
+++ b/completions/wvdial
@@ -2,7 +2,7 @@
 
 _wvdial()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -12,7 +12,7 @@ _wvdial()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     local config i IFS=$'\n'
 
diff --git a/completions/xmms b/completions/xmms
index 9bae002c95c..e9a50b24fc9 100644
--- a/completions/xmms
+++ b/completions/xmms
@@ -2,7 +2,7 @@
 
 _xmms()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[SRA]*)'
@@ -17,7 +17,7 @@ _xmms()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/xvfb-run b/completions/xvfb-run
index dc3725804f3..8b2f628a369 100644
--- a/completions/xvfb-run
+++ b/completions/xvfb-run
@@ -2,7 +2,7 @@
 
 _xvfb_run()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[npsef]*)'
@@ -27,7 +27,7 @@ _xvfb_run()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/xz b/completions/xz
index ac9fd74f6bd..fafac286e96 100644
--- a/completions/xz
+++ b/completions/xz
@@ -2,7 +2,7 @@
 
 _xz()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local xspec="*.@(xz|lzma|txz|tlz)"
@@ -38,7 +38,7 @@ _xz()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1" --long-help) {-1..-9}' \
diff --git a/completions/xzdec b/completions/xzdec
index c9219c35a75..a678bd2e936 100644
--- a/completions/xzdec
+++ b/completions/xzdec
@@ -2,7 +2,7 @@
 
 _xzdec()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*M*)'
@@ -16,7 +16,7 @@ _xzdec()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
diff --git a/completions/zopflipng b/completions/zopflipng
index fa779fa4c11..4dfa1b532ad 100644
--- a/completions/zopflipng
+++ b/completions/zopflipng
@@ -2,7 +2,7 @@
 
 _zopflipng()
 {
-    local cur prev words cword split comp_args
+    local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
@@ -15,7 +15,7 @@ _zopflipng()
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
         COMPREPLY=($(_parse_help "$1" -h))
diff --git a/doc/styleguide.md b/doc/styleguide.md
index a0225a09333..bc6cad979ca 100644
--- a/doc/styleguide.md
+++ b/doc/styleguide.md
@@ -78,7 +78,7 @@ appended after the equal sign. Calling `compopt -o nospace` makes sense
 in case completion actually occurs: when only one completion is
 available in `COMPREPLY`.
 
-## `$split && return`
+## `[[ $was_split ]] && return`
 
 Should be used in completions using the `-s` flag of `_comp_initialize`,
 or other similar cases where `_split_longopt` has been invoked, after