diff --git a/bash_completion b/bash_completion
index 1be07cc2d31..4bfe022ccb0 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1190,10 +1190,52 @@ _comp_initialize()
     return 0
 }
 
-# Helper function for _parse_help and _parse_usage.
+# Helper function for _comp_compgen_help and _comp_compgen_usage.
+# Obtain the help output based on the arguments.
+# @param $@ args  Arguments specified to the caller.
+# @var[out] _lines
+# @return 2 if the usage is wrong, 1 if no output is obtained, or otherwise 0.
+_comp_compgen_help__get_help_lines()
+{
+    local -a help_cmd
+    case ${1-} in
+        -)
+            if (($# > 1)); then
+                printf 'bash_completion: %s -: extra arguments for -\n' "${FUNCNAME[1]}" >&2
+                printf 'usage: %s -\n' "${FUNCNAME[1]}" >&2
+                printf 'usage: %s -c cmd args...\n' "${FUNCNAME[1]}" >&2
+                printf 'usage: %s [-- args...]\n' "${FUNCNAME[1]}" >&2
+                return 2
+            fi
+            help_cmd=(exec cat)
+            ;;
+        -c)
+            if (($# < 2)); then
+                printf 'bash_completion: %s -c: no command is specified\n' "${FUNCNAME[1]}" >&2
+                printf 'usage: %s -\n' "${FUNCNAME[1]}" >&2
+                printf 'usage: %s -c cmd args...\n' "${FUNCNAME[1]}" >&2
+                printf 'usage: %s [-- args...]\n' "${FUNCNAME[1]}" >&2
+                return 2
+            fi
+            help_cmd=("${@:2}")
+            ;;
+        --) shift 1 ;&
+        *)
+            local ret
+            _comp_dequote "${comp_args[0]-}" || ret=${comp_args[0]-}
+            help_cmd=("${ret:-false}" "$@")
+            ;;
+    esac
+
+    local ret
+    _comp_split -l ret "$(LC_ALL=C "${help_cmd[@]}" 2>&1)" &&
+        _lines=("${ret[@]}")
+}
+
+# Helper function for _comp_compgen_help and _comp_compgen_usage.
+# @var[in,out] _options Add options
 # @return True (0) if an option was found, False (> 0) otherwise
-# TODO: rename per API conventions, rework to use vars rather than outputting
-__parse_options()
+_comp_compgen_help__parse()
 {
     local option option2 i
 
@@ -1219,7 +1261,7 @@ __parse_options()
     if [[ $option =~ (\[((no|dont)-?)\]). ]]; then
         option2=${option/"${BASH_REMATCH[1]}"/}
         option2=${option2%%[<{().[]*}
-        printf '%s\n' "${option2/=*/=}"
+        _options+=("${option2/=*/=}")
         option=${option/"${BASH_REMATCH[1]}"/"${BASH_REMATCH[2]}"}
     fi
 
@@ -1227,100 +1269,81 @@ __parse_options()
     option=${option/=*/=}
     [[ $option ]] || return 1
 
-    printf '%s\n' "$option"
+    _options+=("$option")
 }
 
-# Parse GNU style help output of the given command.
-# @param $1  command; if "-", read from stdin and ignore rest of args
-# @param $2  command options (default: --help)
+# Parse GNU style help output of the given command and generate and store
+# completions in an array. The help output is produced in the way depending on
+# the usage:
+# usage: _comp_compgen_help -              # read from stdin
+# usage: _comp_compgen_help -c cmd args... # run "cmd args..."
+# usage: _comp_compgen_help [[--] args...] # run "${comp_args[0]} args..."
+# When no arguments are specified, `--help` is assumed.
 #
-# TODO: rename per API conventions, rework to use vars rather than outputting
-_parse_help()
+# @var[in] comp_args[0]
+_comp_compgen_help()
 {
-    local IFS=$' \t\n'
-    local reset_monitor=$(shopt -po monitor) reset_lastpipe=$(shopt -p lastpipe) reset_noglob=$(shopt -po noglob)
-    set +o monitor
-    shopt -s lastpipe
-    set -o noglob
+    (($#)) || set -- -- --help
 
-    local cmd=$1
-    local line rc=1
-    (
-        case $cmd in
-            -) exec cat ;;
-            *)
-                # shellcheck disable=SC2086
-                _comp_dequote "$cmd" && LC_ALL=C "$ret" ${2:---help} 2>&1
-                ;;
-        esac
-    ) |
-        while read -r line; do
-
-            [[ $line == *([[:blank:]])-* ]] || continue
-            # transform "-f FOO, --foo=FOO" to "-f , --foo=FOO" etc
-            while [[ $line =~ ((^|[^-])-[A-Za-z0-9?][[:space:]]+)\[?[A-Z0-9]+([,_-]+[A-Z0-9]+)?(\.\.+)?\]? ]]; do
-                line=${line/"${BASH_REMATCH[0]}"/"${BASH_REMATCH[1]}"}
-            done
-            __parse_options "${line// or /, }" && rc=0
+    local -a _lines
+    _comp_compgen_help__get_help_lines "$@" || return "$?"
 
+    local -a _options=()
+    local _line
+    for _line in "${_lines[@]}"; do
+        [[ $_line == *([[:blank:]])-* ]] || continue
+        # transform "-f FOO, --foo=FOO" to "-f , --foo=FOO" etc
+        while [[ $_line =~ ((^|[^-])-[A-Za-z0-9?][[:space:]]+)\[?[A-Z0-9]+([,_-]+[A-Z0-9]+)?(\.\.+)?\]? ]]; do
+            _line=${_line/"${BASH_REMATCH[0]}"/"${BASH_REMATCH[1]}"}
         done
+        _comp_compgen_help__parse "${_line// or /, }"
+    done
+    ((${#_options[@]})) || return 1
 
-    $reset_monitor
-    $reset_lastpipe
-    $reset_noglob
-    return $rc
+    _comp_compgen -- -W '"${_options[@]}"'
+    return 0
 }
 
-# Parse BSD style usage output (options in brackets) of the given command.
-# @param $1  command; if "-", read from stdin and ignore rest of args
-# @param $2  command options (default: --usage)
-#
-# TODO: rename per API conventions, rework to use vars rather than outputting
-_parse_usage()
-{
-    local IFS=$' \t\n'
-    local reset_monitor=$(shopt -po monitor) reset_lastpipe=$(shopt -p lastpipe) reset_noglob=$(shopt -po noglob)
-    set +o monitor
-    shopt -s lastpipe
-    set -o noglob
-
-    local cmd=$1
-    local line match option i char rc=1
-    (
-        case $cmd in
-            -) exec cat ;;
-            *)
-                # shellcheck disable=SC2086
-                _comp_dequote "$cmd" && LC_ALL=C "$ret" ${2:---usage} 2>&1
-                ;;
-        esac
-    ) |
-        while read -r line; do
-
-            while [[ $line =~ \[[[:space:]]*(-[^]]+)[[:space:]]*\] ]]; do
-                match=${BASH_REMATCH[0]}
-                option=${BASH_REMATCH[1]}
-                case $option in
-                    -?(\[)+([a-zA-Z0-9?]))
-                        # Treat as bundled short options
-                        for ((i = 1; i < ${#option}; i++)); do
-                            char=${option:i:1}
-                            [[ $char != '[' ]] && printf '%s\n' -"$char" && rc=0
-                        done
-                        ;;
-                    *)
-                        __parse_options "$option" && rc=0
-                        ;;
-                esac
-                line=${line#*"$match"}
-            done
-
+# Parse BSD style usage output (options in brackets) of the given command. The
+# help output is produced in the way depending on the usage:
+# usage: _comp_compgen_usage -              # read from stdin
+# usage: _comp_compgen_usage -c cmd args... # run "cmd args..."
+# usage: _comp_compgen_usage [[--] args...] # run "${comp_args[0]} args..."
+# When no arguments are specified, `--usage` is assumed.
+#
+# @var[in] comp_args[0]
+_comp_compgen_usage()
+{
+    (($#)) || set -- -- --usage
+
+    local -a _lines
+    _comp_compgen_help__get_help_lines "$@" || return "$?"
+
+    local -a _options=()
+    local _line _match _option _i _char
+    for _line in "${_lines[@]}"; do
+        while [[ $_line =~ \[[[:space:]]*(-[^]]+)[[:space:]]*\] ]]; do
+            _match=${BASH_REMATCH[0]}
+            _option=${BASH_REMATCH[1]}
+            case $_option in
+                -?(\[)+([a-zA-Z0-9?]))
+                    # Treat as bundled short options
+                    for ((_i = 1; _i < ${#_option}; _i++)); do
+                        _char=${_option:_i:1}
+                        [[ $_char != '[' ]] && _options+=("-$_char")
+                    done
+                    ;;
+                *)
+                    _comp_compgen_help__parse "$_option"
+                    ;;
+            esac
+            _line=${_line#*"$_match"}
         done
+    done
+    ((${#_options[@]})) || return 1
 
-    $reset_monitor
-    $reset_lastpipe
-    $reset_noglob
-    return $rc
+    _comp_compgen -- -W '"${_options[@]}"'
+    return 0
 }
 
 # This function completes on signal names (minus the SIG prefix)
diff --git a/bash_completion.d/000_bash_completion_compat.bash b/bash_completion.d/000_bash_completion_compat.bash
index 45f6d80497e..47e5f9318d6 100644
--- a/bash_completion.d/000_bash_completion_compat.bash
+++ b/bash_completion.d/000_bash_completion_compat.bash
@@ -276,4 +276,62 @@ _tilde()
     ! _comp_compgen -c "$1" tilde
 }
 
+# Helper function for _parse_help and _parse_usage.
+# @return True (0) if an option was found, False (> 0) otherwise
+# @deprecated Use _comp_compgen_help__parse
+__parse_options()
+{
+    local -a _options=()
+    _comp_compgen_help__parse "$1"
+    printf '%s\n' "${_options[@]}"
+}
+
+# Parse GNU style help output of the given command.
+# @param $1  command; if "-", read from stdin and ignore rest of args
+# @param $2  command options (default: --help)
+# @deprecated Use `_comp_compgen_help`.  `COMPREPLY=($(compgen -W
+#   '$(_parse_help "$1" ...)' -- "$cur"))` can be replaced with
+#   `_comp_compgen_help [-- ...]`.  Also, `var=($(_parse_help "$1" ...))` can
+#   be replaced with `_comp_compgen -Rv var help [-- ...]`.
+_parse_help()
+{
+    local -a args
+    if [[ $1 == - ]]; then
+        args=(-)
+    else
+        local ret opt IFS=$' \t\n'
+        _comp_dequote "$1"
+        _comp_split opt "${2:---help}"
+        args=(-c "$ret" ${opt[@]+"${opt[@]}"})
+    fi
+    local -a ret=()
+    _comp_compgen -Rv ret help "${args[@]}" || return 1
+    ((${#ret[@]})) && printf '%s\n' "${ret[@]}"
+    return 0
+}
+
+# Parse BSD style usage output (options in brackets) of the given command.
+# @param $1  command; if "-", read from stdin and ignore rest of args
+# @param $2  command options (default: --usage)
+# @deprecated Use `_comp_compgen_usage`.  `COMPREPLY=($(compgen -W
+#   '$(_parse_usage "$1" ...)' -- "$cur"))` can be replaced with
+#   `_comp_compgen_usage [-- ...]`. `var=($(_parse_usage "$1" ...))` can be
+#   replaced with `_comp_compgen -Rv var usage [-- ...]`.
+_parse_usage()
+{
+    local -a args
+    if [[ $1 == - ]]; then
+        args=(-)
+    else
+        local ret opt IFS=$' \t\n'
+        _comp_dequote "$1"
+        _comp_split opt "${2:---usage}"
+        args=(-c "$ret" ${opt[@]+"${opt[@]}"})
+    fi
+    local -a ret=()
+    _comp_compgen -Rv ret usage "${args[@]}" || return 1
+    ((${#ret[@]})) && printf '%s\n' "${ret[@]}"
+    return 0
+}
+
 # ex: filetype=sh
diff --git a/completions/2to3 b/completions/2to3
index 7d3a06091f8..c22d12dc88e 100644
--- a/completions/2to3
+++ b/completions/2to3
@@ -27,7 +27,7 @@ _comp_cmd_2to3()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/_adb b/completions/_adb
index 6b0d66705b6..2858cad3457 100644
--- a/completions/_adb
+++ b/completions/_adb
@@ -37,7 +37,7 @@ _comp_cmd_adb()
     if [[ ! $has_cmd ]]; then
         local tmp=()
         if [[ ! $cur || $cur == -* ]]; then
-            tmp+=($(compgen -W '$(_parse_help "$1" help)' -- "$cur"))
+            _comp_compgen -av tmp help -- help
         fi
         if [[ ! $cur || $cur != -* ]]; then
             tmp+=($("$1" help 2>&1 | awk '$1 == "adb" { print $2 }'))
diff --git a/completions/_cal b/completions/_cal
index 15e48f6d4b9..3dbdba3b3f3 100644
--- a/completions/_cal
+++ b/completions/_cal
@@ -24,9 +24,7 @@ _comp_cmd_cal()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(
-            compgen -W '$(_parse_help "$1" || _parse_usage "$1")' -- "$cur"
-        ))
+        _comp_compgen_help || _comp_compgen_usage
         return
     fi
 
diff --git a/completions/_chsh b/completions/_chsh
index 53945391d6d..082a3b5a65f 100644
--- a/completions/_chsh
+++ b/completions/_chsh
@@ -32,9 +32,7 @@ _comp_cmd_chsh()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(
-            compgen -W '$(_parse_help "$1" || _parse_usage "$1")' -- "$cur"
-        ))
+        _comp_compgen_help || _comp_compgen_usage
     else
         _allowed_users
     fi
diff --git a/completions/_dmesg b/completions/_dmesg
index 348aac1c127..3b72fad72fa 100644
--- a/completions/_dmesg
+++ b/completions/_dmesg
@@ -25,9 +25,7 @@ _comp_cmd_dmesg()
             ;;
     esac
 
-    COMPREPLY=($(
-        compgen -W '$(_parse_help "$1" || _parse_usage "$1")' -- "$cur"
-    ))
+    _comp_compgen_help || _comp_compgen_usage
 } &&
     complete -F _comp_cmd_dmesg dmesg
 
diff --git a/completions/_eject b/completions/_eject
index 7c3413dce2d..1daec085428 100644
--- a/completions/_eject
+++ b/completions/_eject
@@ -19,7 +19,7 @@ _comp_cmd_eject()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         return
     elif [[ $prev == @(-d|--default) ]]; then
         return
diff --git a/completions/_hexdump b/completions/_hexdump
index 473d9ea7b0e..939cfa6656d 100644
--- a/completions/_hexdump
+++ b/completions/_hexdump
@@ -19,9 +19,7 @@ _comp_cmd_hexdump()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(
-            compgen -W '$(_parse_help "$1" || _parse_usage "$1")' -- "$cur"
-        ))
+        _comp_compgen_help || _comp_compgen_usage
         return
     fi
 
diff --git a/completions/_ionice b/completions/_ionice
index 66c2b3e8d80..77621eaaa16 100644
--- a/completions/_ionice
+++ b/completions/_ionice
@@ -51,7 +51,7 @@ _comp_cmd_ionice()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
+        _comp_compgen_help -- -h
         return
     fi
 } &&
diff --git a/completions/_mock b/completions/_mock
index 6fe05e6254c..77c6681ed64 100644
--- a/completions/_mock
+++ b/completions/_mock
@@ -58,7 +58,7 @@ _comp_cmd_mock()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         _comp_compgen_filedir '@(?(no)src.r|s)pm'
diff --git a/completions/_repomanage b/completions/_repomanage
index 465b845ab01..3a7c5ad15f1 100644
--- a/completions/_repomanage
+++ b/completions/_repomanage
@@ -13,7 +13,7 @@ _comp_cmd_repomanage()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         _comp_compgen_filedir -d
diff --git a/completions/_reptyr b/completions/_reptyr
index 78d22b2e13c..6a42da42f36 100644
--- a/completions/_reptyr
+++ b/completions/_reptyr
@@ -15,7 +15,7 @@ _comp_cmd_reptyr()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         return
     fi
 
diff --git a/completions/_rtcwake b/completions/_rtcwake
index cd977b9da5e..9945d149224 100644
--- a/completions/_rtcwake
+++ b/completions/_rtcwake
@@ -26,7 +26,7 @@ _comp_cmd_rtcwake()
 
     [[ $was_split ]] && return
 
-    COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+    _comp_compgen_help
 } &&
     complete -F _comp_cmd_rtcwake rtcwake
 
diff --git a/completions/_su b/completions/_su
index 53838ec5f51..60bc959ab1e 100644
--- a/completions/_su
+++ b/completions/_su
@@ -29,7 +29,7 @@ _comp_cmd_su()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/_udevadm b/completions/_udevadm
index da98c3bf32f..057e72c0493 100644
--- a/completions/_udevadm
+++ b/completions/_udevadm
@@ -67,8 +67,7 @@ _comp_cmd_udevadm()
     fi
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W \
-            '$(_parse_help "$1" "${udevcmd-} --help")' -- "$cur"))
+        _comp_compgen_help -- ${has_udevcmd:+"$udevcmd"} --help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
diff --git a/completions/_yum b/completions/_yum
index 31cbddf5b64..b142bc4864a 100644
--- a/completions/_yum
+++ b/completions/_yum
@@ -141,7 +141,7 @@ _comp_cmd_yum()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
diff --git a/completions/a2x b/completions/a2x
index df3ca0d6700..63c410ee690 100644
--- a/completions/a2x
+++ b/completions/a2x
@@ -29,7 +29,7 @@ _comp_cmd_a2x()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" --help)' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/aclocal b/completions/aclocal
index c8fcb178750..2669efe4aa6 100644
--- a/completions/aclocal
+++ b/completions/aclocal
@@ -27,7 +27,7 @@ _comp_cmd_aclocal()
 
     [[ $was_split ]] && return
 
-    COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+    _comp_compgen_help
     [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 } &&
     complete -F _comp_cmd_aclocal aclocal aclocal-1.1{0..6}
diff --git a/completions/acpi b/completions/acpi
index bb21058bf6b..207a043ff7d 100644
--- a/completions/acpi
+++ b/completions/acpi
@@ -17,7 +17,7 @@ _comp_cmd_acpi()
             ;;
     esac
 
-    COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+    _comp_compgen_help
 } &&
     complete -F _comp_cmd_acpi acpi
 
diff --git a/completions/alias b/completions/alias
index 163c6e58aa1..35b0d8e5370 100644
--- a/completions/alias
+++ b/completions/alias
@@ -19,7 +19,7 @@ _comp_cmd_alias()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage help "-s $1")' -- "$cur"))
+        _comp_compgen_usage -c help -s "$1"
         ((${#COMPREPLY[*]} != 1)) || compopt +o nospace
     fi
 } &&
diff --git a/completions/ant b/completions/ant
index 0caabc2b901..85e2e5e0558 100644
--- a/completions/ant
+++ b/completions/ant
@@ -64,8 +64,7 @@ _comp_cmd_ant()
     elif [[ $cur == -* ]]; then
         # The </dev/null prevents "phing -" weirdness/getting just a literal
         # tab displayed on complete on CentOS 6 with phing 2.6.1.
-        COMPREPLY=(
-            $(compgen -W '$(_parse_help "$1" -h </dev/null)' -- "$cur"))
+        _comp_compgen_help -- -h </dev/null
     else
         # available targets completion
         # find which buildfile to use
diff --git a/completions/appdata-validate b/completions/appdata-validate
index 24a244ca7d0..66ec7a75d12 100644
--- a/completions/appdata-validate
+++ b/completions/appdata-validate
@@ -20,7 +20,7 @@ _comp_cmd_appdata_validate()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/arch b/completions/arch
index 19b418b1234..6f3f68919c1 100644
--- a/completions/arch
+++ b/completions/arch
@@ -22,7 +22,7 @@ _comp_have_command mailmanctl &&
         [[ $was_split ]] && return
 
         if [[ $cur == -* ]]; then
-            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+            _comp_compgen_help
         else
             local args=$cword
             for ((i = 1; i < cword; i++)); do
diff --git a/completions/arp b/completions/arp
index 4492d6f40dc..c121053f09e 100644
--- a/completions/arp
+++ b/completions/arp
@@ -29,9 +29,7 @@ _comp_cmd_arp()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(
-            compgen -W '$(_parse_help "$1" || _parse_usage "$1")' -- "$cur"
-        ))
+        _comp_compgen_help || _comp_compgen_usage
         return
     fi
 
diff --git a/completions/arping b/completions/arping
index daf707acc11..c98b59d3f94 100644
--- a/completions/arping
+++ b/completions/arping
@@ -20,7 +20,7 @@ _comp_cmd_arping()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
+        _comp_compgen_help -- -h
         return
     fi
 
diff --git a/completions/arpspoof b/completions/arpspoof
index e62ec0a6ff8..de758860bd0 100644
--- a/completions/arpspoof
+++ b/completions/arpspoof
@@ -17,7 +17,7 @@ _comp_cmd_arpspoof()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
+        _comp_compgen_usage
     else
         _known_hosts_real -- "$cur"
     fi
diff --git a/completions/asciidoc b/completions/asciidoc
index 51ec738b8d6..e14d31559d1 100644
--- a/completions/asciidoc
+++ b/completions/asciidoc
@@ -43,8 +43,7 @@ _comp_cmd_asciidoc()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" "--help manpage")' \
-            -- "$cur"))
+        _comp_compgen_help -- --help manpage
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/autoconf b/completions/autoconf
index c3168bdfeb8..77d7788d283 100644
--- a/completions/autoconf
+++ b/completions/autoconf
@@ -28,7 +28,7 @@ _comp_cmd_autoconf()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/automake b/completions/automake
index c73d553830c..dd65ec9be9c 100644
--- a/completions/automake
+++ b/completions/automake
@@ -24,7 +24,7 @@ _comp_cmd_automake()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/autoreconf b/completions/autoreconf
index 78e8f1cf172..0b2319a8fbc 100644
--- a/completions/autoreconf
+++ b/completions/autoreconf
@@ -25,7 +25,7 @@ _comp_cmd_autoreconf()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/autoscan b/completions/autoscan
index 6073835cd0b..fe48b56e2c5 100644
--- a/completions/autoscan
+++ b/completions/autoscan
@@ -20,7 +20,7 @@ _comp_cmd_autoscan()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/avahi-browse b/completions/avahi-browse
index cc45fefab5d..08d24819c96 100644
--- a/completions/avahi-browse
+++ b/completions/avahi-browse
@@ -19,7 +19,7 @@ _comp_cmd_avahi_browse()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} != *= ]] || compopt -o nospace
         return
     fi
diff --git a/completions/bind b/completions/bind
index ffe168c8bf9..907350e0636 100644
--- a/completions/bind
+++ b/completions/bind
@@ -25,7 +25,7 @@ _comp_cmd_bind()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage help "-s $1")' -- "$cur"))
+        _comp_compgen_usage -c help -s "$1"
         return
     fi
 
diff --git a/completions/ccache b/completions/ccache
index b244c069e27..c8cf2e002b5 100644
--- a/completions/ccache
+++ b/completions/ccache
@@ -32,7 +32,7 @@ _comp_cmd_ccache()
 
     [[ $was_split ]] && return
 
-    COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+    _comp_compgen_help
     [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 } &&
     complete -F _comp_cmd_ccache ccache
diff --git a/completions/ccze b/completions/ccze
index 9d917521ae9..36b6f21e06c 100644
--- a/completions/ccze
+++ b/completions/ccze
@@ -38,7 +38,7 @@ _comp_cmd_ccze()
 
     [[ $was_split ]] && return
 
-    COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+    _comp_compgen_help
     [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 } &&
     complete -F _comp_cmd_ccze ccze
diff --git a/completions/cd b/completions/cd
index 9b1189cba79..3a9442b72d6 100644
--- a/completions/cd
+++ b/completions/cd
@@ -8,8 +8,7 @@ _comp_cmd_cd()
     _comp_initialize -- "$@" || return
 
     if [[ $cur == -* ]]; then
-        local cmd=$1
-        _comp_compgen -- -W '$(_parse_help help "$cmd")'
+        _comp_compgen_help -c help "$1"
         compopt +o nospace
         return
     fi
diff --git a/completions/cfagent b/completions/cfagent
index 9691d658a80..113e417fd03 100644
--- a/completions/cfagent
+++ b/completions/cfagent
@@ -13,7 +13,7 @@ _comp_cmd_cfagent()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
     fi
 } &&
     complete -F _comp_cmd_cfagent cfagent
diff --git a/completions/cfrun b/completions/cfrun
index 3d47456221e..123549631d3 100644
--- a/completions/cfrun
+++ b/completions/cfrun
@@ -38,7 +38,7 @@ _comp_cmd_cfrun()
             fi
             ;;
         2)
-            COMPREPLY=($(compgen -W '$(_parse_help cfagent)' -- "$cur"))
+            _comp_compgen_help -c cfagent --help
             ;;
     esac
 } &&
diff --git a/completions/chage b/completions/chage
index 80250d3523b..dac158dc19d 100644
--- a/completions/chage
+++ b/completions/chage
@@ -21,7 +21,7 @@ _comp_cmd_chage()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         return
     fi
 
diff --git a/completions/checksec b/completions/checksec
index 347ee9dac01..a87459cf658 100644
--- a/completions/checksec
+++ b/completions/checksec
@@ -44,7 +44,7 @@ _comp_cmd_checksec()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/chmod b/completions/chmod
index 67095b976d0..cf9a5b169c9 100644
--- a/completions/chmod
+++ b/completions/chmod
@@ -22,9 +22,7 @@ _comp_cmd_chmod()
 
     # shellcheck disable=SC2053
     if [[ $cur == -* && $cur != $modearg ]]; then
-        COMPREPLY=($(
-            compgen -W '$(_parse_help "$1" || _parse_usage "$1")' -- "$cur"
-        ))
+        _comp_compgen_help || _comp_compgen_usage
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/chpasswd b/completions/chpasswd
index 3055588db94..b1ad3b1476c 100644
--- a/completions/chpasswd
+++ b/completions/chpasswd
@@ -24,7 +24,7 @@ _comp_cmd_chpasswd()
 
     [[ $was_split ]] && return
 
-    COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+    _comp_compgen_help
     [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 } &&
     complete -F _comp_cmd_chpasswd chpasswd
diff --git a/completions/chromium-browser b/completions/chromium-browser
index 4f0d02d8598..03dd335df32 100644
--- a/completions/chromium-browser
+++ b/completions/chromium-browser
@@ -37,7 +37,7 @@ _comp_cmd_chromium_browser()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/chrpath b/completions/chrpath
index f2f7c168ca8..c248a059483 100644
--- a/completions/chrpath
+++ b/completions/chrpath
@@ -18,7 +18,7 @@ _comp_cmd_chrpath()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         return
     fi
 
diff --git a/completions/cksfv b/completions/cksfv
index 0dbe3ab0f78..406c8def6c3 100644
--- a/completions/cksfv
+++ b/completions/cksfv
@@ -6,7 +6,7 @@ _comp_cmd_cksfv()
     _comp_initialize -- "$@" || return
 
     if ((cword == 1)); then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         return
     fi
 
diff --git a/completions/configure b/completions/configure
index 9116e7ec0dd..92768d170ef 100644
--- a/completions/configure
+++ b/completions/configure
@@ -34,7 +34,7 @@ _comp_cmd_configure()
             -- "$cur"))
         [[ ${COMPREPLY-} == *=* ]] && compopt -o nospace
     else
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
diff --git a/completions/convert b/completions/convert
index 7a66a7b5eea..412d31189ec 100644
--- a/completions/convert
+++ b/completions/convert
@@ -135,7 +135,7 @@ _comp_cmd_convert()
     _comp_cmd_convert__common_options && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+        _comp_compgen_help -- -help
     elif [[ $cur == +* ]]; then
         COMPREPLY=($(compgen -W '+adjoin +append +compress +contrast +debug
             +dither +endian +gamma +label +map +mask +matte +negate +noise
@@ -154,7 +154,7 @@ _comp_cmd_mogrify()
     _comp_cmd_convert__common_options && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+        _comp_compgen_help -- -help
     elif [[ $cur == +* ]]; then
         COMPREPLY=($(compgen -W '+compress +contrast +debug +dither +endian
             +gamma +label +map +mask +matte +negate +page +raise' -- "$cur"))
@@ -172,7 +172,7 @@ _comp_cmd_display()
     _comp_cmd_convert__common_options && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+        _comp_compgen_help -- -help
     elif [[ $cur == +* ]]; then
         COMPREPLY=($(compgen -W '+compress +contrast +debug +dither +endian
             +gamma +label +map +matte +negate +page +raise +write' -- "$cur"))
@@ -190,7 +190,7 @@ _comp_cmd_animate()
     _comp_cmd_convert__common_options && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+        _comp_compgen_help -- -help
     elif [[ $cur == +* ]]; then
         COMPREPLY=($(compgen -W '+debug +dither +gamma +map +matte' \
             -- "$cur"))
@@ -208,7 +208,7 @@ _comp_cmd_identify()
     _comp_cmd_convert__common_options && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+        _comp_compgen_help -- -help
     elif [[ $cur == +* ]]; then
         COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
@@ -225,7 +225,7 @@ _comp_cmd_montage()
     _comp_cmd_convert__common_options && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+        _comp_compgen_help -- -help
     elif [[ $cur == +* ]]; then
         COMPREPLY=($(compgen -W '+adjoin +compress +debug +dither +endian
             +gamma +label +matte +page' -- "$cur"))
@@ -243,7 +243,7 @@ _comp_cmd_composite()
     _comp_cmd_convert__common_options && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+        _comp_compgen_help -- -help
     elif [[ $cur == +* ]]; then
         COMPREPLY=($(compgen -W '+compress +debug +dither +endian +label
             +matte +negate +page +write' -- "$cur"))
@@ -261,7 +261,7 @@ _comp_cmd_compare()
     _comp_cmd_convert__common_options && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+        _comp_compgen_help -- -help
     elif [[ $cur == +* ]]; then
         COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
@@ -278,7 +278,7 @@ _comp_cmd_conjure()
     _comp_cmd_convert__common_options && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+        _comp_compgen_help -- -help
     elif [[ $cur == +* ]]; then
         COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
@@ -295,7 +295,7 @@ _comp_cmd_import()
     _comp_cmd_convert__common_options && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+        _comp_compgen_help -- -help
     elif [[ $cur == +* ]]; then
         COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
@@ -312,7 +312,7 @@ _comp_cmd_stream()
     _comp_cmd_convert__common_options && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+        _comp_compgen_help -- -help
     elif [[ $cur == +* ]]; then
         COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
diff --git a/completions/cpan2dist b/completions/cpan2dist
index 99cfc6a861c..20c0f5e4eff 100644
--- a/completions/cpan2dist
+++ b/completions/cpan2dist
@@ -20,7 +20,7 @@ _comp_cmd_cpan2dist()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
     else
         local cpandirs=("$HOME/.cpanplus/" "$HOME/.cpan/source/modules/")
         local dir packagelist=
diff --git a/completions/cppcheck b/completions/cppcheck
index 80233c7d3b1..b5499777502 100644
--- a/completions/cppcheck
+++ b/completions/cppcheck
@@ -80,7 +80,7 @@ _comp_cmd_cppcheck()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         _comp_compgen_filedir '@([cht]pp|[cht]xx|cc|[ch]++|[ch])'
diff --git a/completions/cryptsetup b/completions/cryptsetup
index 2acd52f5e71..1ed50d8fd94 100644
--- a/completions/cryptsetup
+++ b/completions/cryptsetup
@@ -38,7 +38,7 @@ _comp_cmd_cryptsetup()
     _get_first_arg
     if [[ ! $arg ]]; then
         if [[ $cur == -* ]]; then
-            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+            _comp_compgen_help
             [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         else
             COMPREPLY=($(compgen -W 'open close resize status benchmark
diff --git a/completions/curl b/completions/curl
index bdefa4af78a..76ecbd4cdf0 100644
--- a/completions/curl
+++ b/completions/curl
@@ -158,7 +158,7 @@ _comp_cmd_curl()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" "--help all")' -- "$cur"))
+        _comp_compgen_help -- --help all
         [[ ${COMPREPLY-} ]] ||
             COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     fi
diff --git a/completions/cvs b/completions/cvs
index 45810582c56..22004e3408e 100644
--- a/completions/cvs
+++ b/completions/cvs
@@ -29,7 +29,7 @@ _cvs_commands()
 
 _comp_cmd_cvs__command_options()
 {
-    COMPREPLY=($(compgen -W '$(_parse_help "$1" "--help $2")' -- "$cur"))
+    _comp_compgen_help -- --help "$2"
 }
 
 _comp_cmd_cvs__kflags()
diff --git a/completions/cvsps b/completions/cvsps
index 429d51b65e1..5f4c01415bb 100644
--- a/completions/cvsps
+++ b/completions/cvsps
@@ -48,7 +48,7 @@ _comp_cmd_cvsps()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
+        _comp_compgen_help -- -h
     else
         _comp_xfunc cvs roots
     fi
diff --git a/completions/deja-dup b/completions/deja-dup
index 688ae517bca..0b28928a06c 100644
--- a/completions/deja-dup
+++ b/completions/deja-dup
@@ -22,7 +22,7 @@ _comp_cmd_deja_dup()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" --help-all)' -- "$cur"))
+        _comp_compgen_help -- --help-all
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/desktop-file-validate b/completions/desktop-file-validate
index 815e226ea3a..ef1fe9ab3de 100644
--- a/completions/desktop-file-validate
+++ b/completions/desktop-file-validate
@@ -12,7 +12,7 @@ _comp_cmd_desktop_file_validate()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         return
     fi
 
diff --git a/completions/dhclient b/completions/dhclient
index 22260a902ec..faabba2a6e6 100644
--- a/completions/dhclient
+++ b/completions/dhclient
@@ -24,7 +24,7 @@ _comp_cmd_dhclient()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
+        _comp_compgen_usage
     else
         _available_interfaces
     fi
diff --git a/completions/dict b/completions/dict
index f590dd47065..d5ddc6ddbf6 100644
--- a/completions/dict
+++ b/completions/dict
@@ -35,7 +35,7 @@ _comp_cmd_dict()
     done
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         return
     fi
 
diff --git a/completions/dmypy b/completions/dmypy
index daf9498da10..bd79e0f5899 100644
--- a/completions/dmypy
+++ b/completions/dmypy
@@ -32,7 +32,7 @@ _comp_cmd_dmypy()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         return
     fi
 
diff --git a/completions/dnsspoof b/completions/dnsspoof
index db41363d30b..651ef775fda 100644
--- a/completions/dnsspoof
+++ b/completions/dnsspoof
@@ -17,7 +17,7 @@ _comp_cmd_dnsspoof()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
+        _comp_compgen_usage
     fi
 
 } &&
diff --git a/completions/dpkg b/completions/dpkg
index 69853870a6a..28aed10bbae 100644
--- a/completions/dpkg
+++ b/completions/dpkg
@@ -115,7 +115,7 @@ _comp_cmd_dpkg()
 
     [[ $was_split ]] && return
 
-    COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+    _comp_compgen_help
     for i in ${!COMPREPLY[*]}; do
         # remove ones ending with a dash (known parse issue, hard to fix)
         [[ ${COMPREPLY[i]} != *- ]] || unset -v 'COMPREPLY[i]'
diff --git a/completions/dselect b/completions/dselect
index a16a86fb78a..1fbbdb9903b 100644
--- a/completions/dselect
+++ b/completions/dselect
@@ -17,7 +17,7 @@ _comp_cmd_dselect()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
     else
         COMPREPLY=($(compgen -W 'access update select install config remove
             quit' -- "$cur"))
diff --git a/completions/dumpe2fs b/completions/dumpe2fs
index b2955c597f8..326564e833b 100644
--- a/completions/dumpe2fs
+++ b/completions/dumpe2fs
@@ -16,7 +16,7 @@ _comp_cmd_dumpe2fs()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
+        _comp_compgen_usage
         return
     fi
 
diff --git a/completions/e2freefrag b/completions/e2freefrag
index 4a630b6704f..7fa4841ca3e 100644
--- a/completions/e2freefrag
+++ b/completions/e2freefrag
@@ -12,7 +12,7 @@ _comp_cmd_e2freefrag()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1" -h)' -- "$cur"))
+        _comp_compgen_usage -- -h
         return
     fi
 
diff --git a/completions/ecryptfs-migrate-home b/completions/ecryptfs-migrate-home
index 9f69e8825b2..0b22aedc8b6 100644
--- a/completions/ecryptfs-migrate-home
+++ b/completions/ecryptfs-migrate-home
@@ -15,7 +15,7 @@ _comp_cmd_ecryptfs_migrate_home()
             ;;
     esac
 
-    COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+    _comp_compgen_help
 } &&
     complete -F _comp_cmd_ecryptfs_migrate_home ecryptfs-migrate-home
 
diff --git a/completions/eog b/completions/eog
index 40314c167a4..a2a811c166e 100644
--- a/completions/eog
+++ b/completions/eog
@@ -14,7 +14,7 @@ _comp_cmd_eog()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" --help-all)' -- "$cur"))
+        _comp_compgen_help -- --help-all
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/evince b/completions/evince
index 9d3180c3e6f..49b67ac330b 100644
--- a/completions/evince
+++ b/completions/evince
@@ -22,7 +22,7 @@ _comp_cmd_evince()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" --help-all)' -- "$cur"))
+        _comp_compgen_help -- --help-all
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/faillog b/completions/faillog
index 529200b3d5b..d83d24e3d2c 100644
--- a/completions/faillog
+++ b/completions/faillog
@@ -20,7 +20,7 @@ _comp_cmd_faillog()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
diff --git a/completions/feh b/completions/feh
index 9a86c954061..cc7a345f2f5 100644
--- a/completions/feh
+++ b/completions/feh
@@ -106,7 +106,7 @@ _comp_cmd_feh()
 
     if [[ $cur == -* ]]; then
         # Some versions of feh just output "See 'man feh'" for --help :(
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" --help)' -- "$cur"))
+        _comp_compgen_help
         if [[ ${COMPREPLY-} ]]; then
             [[ $COMPREPLY == *= ]] && compopt -o nospace
             return
diff --git a/completions/file b/completions/file
index f41ec5a427f..5d728ca4ab8 100644
--- a/completions/file
+++ b/completions/file
@@ -23,7 +23,7 @@ _comp_cmd_file()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         return
     fi
 
diff --git a/completions/file-roller b/completions/file-roller
index 9817fe9e643..7aedc46c98f 100644
--- a/completions/file-roller
+++ b/completions/file-roller
@@ -31,7 +31,7 @@ _comp_cmd_file_roller()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" --help-all)' -- "$cur"))
+        _comp_compgen_help -- --help-all
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/filefrag b/completions/filefrag
index 0bce813fd6d..6de8a19c048 100644
--- a/completions/filefrag
+++ b/completions/filefrag
@@ -6,7 +6,7 @@ _comp_cmd_filefrag()
     _comp_initialize -- "$@" || return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
+        _comp_compgen_usage
         return
     fi
 
diff --git a/completions/filesnarf b/completions/filesnarf
index 8dd40b3a235..e3977317925 100644
--- a/completions/filesnarf
+++ b/completions/filesnarf
@@ -13,7 +13,7 @@ _comp_cmd_snarf()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
+        _comp_compgen_usage
     fi
 
 } &&
diff --git a/completions/firefox b/completions/firefox
index 349d47c6a52..f4af6ccceae 100644
--- a/completions/firefox
+++ b/completions/firefox
@@ -41,7 +41,7 @@ _comp_cmd_firefox()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/flake8 b/completions/flake8
index dc19d4c54dd..fd8c4c2c895 100644
--- a/completions/flake8
+++ b/completions/flake8
@@ -32,7 +32,7 @@ _comp_cmd_flake8()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/freeciv b/completions/freeciv
index 77fcbe47b30..ff3e6300018 100644
--- a/completions/freeciv
+++ b/completions/freeciv
@@ -32,7 +32,7 @@ _comp_cmd_freeciv()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
     fi
 
 } &&
diff --git a/completions/freeciv-server b/completions/freeciv-server
index 59ac7f93933..fd91fa07a26 100644
--- a/completions/freeciv-server
+++ b/completions/freeciv-server
@@ -13,7 +13,7 @@ _comp_cmd_civserver()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
     fi
 
 } &&
diff --git a/completions/fusermount b/completions/fusermount
index 40e04827c1d..26c6c3ef26f 100644
--- a/completions/fusermount
+++ b/completions/fusermount
@@ -18,7 +18,7 @@ _comp_cmd_fusermount()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
+        _comp_compgen_help -- -h
     else
         _comp_compgen_filedir -d
     fi
diff --git a/completions/genisoimage b/completions/genisoimage
index d464c8009cf..ba735721481 100644
--- a/completions/genisoimage
+++ b/completions/genisoimage
@@ -27,7 +27,7 @@ _comp_cmd_mkisofs()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+        _comp_compgen_help -- -help
     else
         _comp_compgen_filedir
     fi
diff --git a/completions/geoiplookup b/completions/geoiplookup
index cefc9b4de6e..904d03db791 100644
--- a/completions/geoiplookup
+++ b/completions/geoiplookup
@@ -20,7 +20,7 @@ _comp_cmd_geoiplookup()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1" -h)' -- "$cur"))
+        _comp_compgen_usage -- -h
         return
     fi
 
diff --git a/completions/getent b/completions/getent
index 35cb0a181fa..683f5eee8c9 100644
--- a/completions/getent
+++ b/completions/getent
@@ -67,7 +67,7 @@ _comp_cmd_getent()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     elif [[ ! $has_db ]]; then
         COMPREPLY=($(compgen -W 'passwd group hosts services protocols
diff --git a/completions/gkrellm b/completions/gkrellm
index 1641b64a7e9..f8440d2e0ea 100644
--- a/completions/gkrellm
+++ b/completions/gkrellm
@@ -32,7 +32,7 @@ _comp_cmd_gkrellm()
             ;;
     esac
 
-    COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+    _comp_compgen_help
 } &&
     complete -F _comp_cmd_gkrellm gkrellm gkrellm2
 
diff --git a/completions/gnome-mplayer b/completions/gnome-mplayer
index f285b7a81a9..3ac47e1a779 100644
--- a/completions/gnome-mplayer
+++ b/completions/gnome-mplayer
@@ -26,7 +26,7 @@ _comp_cmd_gnome_mplayer()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" --help-all)' -- "$cur"))
+        _comp_compgen_help -- --help-all
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/gnome-screenshot b/completions/gnome-screenshot
index f3c93492d3a..ec7b72d31f1 100644
--- a/completions/gnome-screenshot
+++ b/completions/gnome-screenshot
@@ -24,7 +24,7 @@ _comp_cmd_gnome_screenshot()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
diff --git a/completions/gpasswd b/completions/gpasswd
index de4d6bf746b..2e2bc0b2a8a 100644
--- a/completions/gpasswd
+++ b/completions/gpasswd
@@ -16,7 +16,7 @@ _comp_cmd_gpasswd()
 
     if [[ $cur == -* ]]; then
         # TODO: only -A and -M can be combined
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         return
     fi
 
diff --git a/completions/gpgv b/completions/gpgv
index 7c428ea082b..503b1ca7ae0 100644
--- a/completions/gpgv
+++ b/completions/gpgv
@@ -23,7 +23,7 @@ _comp_cmd_gpgv()
     _count_args "" "--@(weak-digest|*-fd|keyring|homedir)"
 
     if [[ $cur == -* && $args -eq 1 ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         return
     fi
 
diff --git a/completions/gphoto2 b/completions/gphoto2
index 5b4304d17f8..bd5fb6f6a58 100644
--- a/completions/gphoto2
+++ b/completions/gphoto2
@@ -45,7 +45,7 @@ _comp_cmd_gphoto2()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 
diff --git a/completions/gprof b/completions/gprof
index 721499cb2ca..666cd1187d2 100644
--- a/completions/gprof
+++ b/completions/gprof
@@ -43,7 +43,7 @@ _comp_cmd_gprof()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
+        _comp_compgen_usage
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/groupadd b/completions/groupadd
index 47b38e32861..fe4e60093b0 100644
--- a/completions/groupadd
+++ b/completions/groupadd
@@ -19,7 +19,7 @@ _comp_cmd_groupadd()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
diff --git a/completions/groupdel b/completions/groupdel
index 2fd0781c313..d3bbcf4c605 100644
--- a/completions/groupdel
+++ b/completions/groupdel
@@ -16,7 +16,7 @@ _comp_cmd_groupdel()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         return
     fi
 
diff --git a/completions/groupmems b/completions/groupmems
index 421146072ff..7a64a2bf632 100644
--- a/completions/groupmems
+++ b/completions/groupmems
@@ -20,7 +20,7 @@ _comp_cmd_groupmems()
             ;;
     esac
 
-    COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+    _comp_compgen_help
 } &&
     complete -F _comp_cmd_groupmems groupmems
 
diff --git a/completions/groupmod b/completions/groupmod
index 8f5ae3d7aae..09eb4a4e217 100644
--- a/completions/groupmod
+++ b/completions/groupmod
@@ -19,7 +19,7 @@ _comp_cmd_groupmod()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/grpck b/completions/grpck
index d6a8dcc50d2..e5ab4852fe7 100644
--- a/completions/grpck
+++ b/completions/grpck
@@ -15,9 +15,7 @@ _comp_cmd_grpck()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(
-            compgen -W '$(_parse_help "$1" || _parse_usage "$1")' -- "$cur"
-        ))
+        _comp_compgen_help || _comp_compgen_usage
         return
     fi
 
diff --git a/completions/gssdp-discover b/completions/gssdp-discover
index 2dcf8014a31..32fe3695235 100644
--- a/completions/gssdp-discover
+++ b/completions/gssdp-discover
@@ -26,7 +26,7 @@ _comp_cmd_gssdp_discover()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
diff --git a/completions/hcitool b/completions/hcitool
index ac570dd3e26..1792e7235c6 100644
--- a/completions/hcitool
+++ b/completions/hcitool
@@ -53,7 +53,7 @@ _comp_cmd_hcitool()
     _get_first_arg
     if [[ ! $arg ]]; then
         if [[ $cur == -* ]]; then
-            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+            _comp_compgen_help
         else
             COMPREPLY=($(compgen -W 'dev inq scan name info spinq epinq cmd
                 con cc dc sr cpt rssi lq tpl afh lst auth enc key clkoff
@@ -125,7 +125,7 @@ _comp_cmd_sdptool()
     _get_first_arg
     if [[ ! $arg ]]; then
         if [[ $cur == -* ]]; then
-            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+            _comp_compgen_help
         else
             COMPREPLY=($(compgen -W 'search browse records add del get
                 setattr setseq' -- "$cur"))
@@ -181,7 +181,7 @@ _comp_cmd_l2ping()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
+        _comp_compgen_usage
     else
         _comp_cmd_hcitool__bluetooth_addresses
     fi
@@ -209,7 +209,7 @@ _comp_cmd_rfcomm()
     _get_first_arg
     if [[ ! $arg ]]; then
         if [[ $cur == -* ]]; then
-            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+            _comp_compgen_help
         else
             COMPREPLY=($(compgen -W 'show connect listen watch bind
                 release' -- "$cur"))
@@ -249,7 +249,7 @@ _comp_cmd_ciptool()
     _get_first_arg
     if [[ ! $arg ]]; then
         if [[ $cur == -* ]]; then
-            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+            _comp_compgen_help
         else
             COMPREPLY=($(compgen -W 'show search connect release loopback' \
                 -- "$cur"))
@@ -281,7 +281,7 @@ _comp_cmd_dfutool()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
     else
         local args
         _count_args
diff --git a/completions/help b/completions/help
index e36cb2f2106..2772d37fd04 100644
--- a/completions/help
+++ b/completions/help
@@ -6,7 +6,7 @@ _comp_cmd_help()
     _comp_initialize -- "$@" || return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1" "-s $1")' -- "$cur"))
+        _comp_compgen_usage -c help -s "$1"
         return
     fi
 
diff --git a/completions/hostname b/completions/hostname
index cc5fea17c44..12b96dc264a 100644
--- a/completions/hostname
+++ b/completions/hostname
@@ -18,9 +18,7 @@ _comp_cmd_hostname()
     esac
 
     [[ $cur == -* ]] &&
-        COMPREPLY=($(
-            compgen -W '$(_parse_help "$1" || _parse_usage "$1")' -- "$cur"
-        ))
+        _comp_compgen_help || _comp_compgen_usage
 } &&
     complete -F _comp_cmd_hostname hostname
 
diff --git a/completions/hping2 b/completions/hping2
index 46d0ec75177..996fd635a27 100644
--- a/completions/hping2
+++ b/completions/hping2
@@ -27,7 +27,7 @@ _comp_cmd_hping2()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
     else
         _known_hosts_real -- "$cur"
     fi
diff --git a/completions/htop b/completions/htop
index a3c8e0ec6a4..7c4f4ad3e28 100644
--- a/completions/htop
+++ b/completions/htop
@@ -25,7 +25,7 @@ _comp_cmd_htop()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" --help)' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/htpasswd b/completions/htpasswd
index e310f607faf..739f9d6b45d 100644
--- a/completions/htpasswd
+++ b/completions/htpasswd
@@ -19,7 +19,7 @@ _comp_cmd_htpasswd()
 
     if ((o == 0 || o == cword)); then
         if [[ $cur == -* ]]; then
-            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+            _comp_compgen_help
             return
         fi
         # Password file (first non-option argument)
diff --git a/completions/hunspell b/completions/hunspell
index e24b8d9d7fb..74a06d1e2a1 100644
--- a/completions/hunspell
+++ b/completions/hunspell
@@ -31,7 +31,7 @@ _comp_cmd_hunspell()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         return
     fi
 
diff --git a/completions/iconv b/completions/iconv
index db43f908e9e..b4dfc040c9a 100644
--- a/completions/iconv
+++ b/completions/iconv
@@ -33,7 +33,7 @@ _comp_cmd_iconv()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
diff --git a/completions/idn b/completions/idn
index 17432b4ed7f..ea44f64691d 100644
--- a/completions/idn
+++ b/completions/idn
@@ -19,7 +19,7 @@ _comp_cmd_idn()
     esac
 
     if [[ ! $was_split && $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
diff --git a/completions/ifstat b/completions/ifstat
index a778e75a03d..93467b96360 100644
--- a/completions/ifstat
+++ b/completions/ifstat
@@ -59,9 +59,7 @@ _comp_cmd_ifstat()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(
-            compgen -W '$(_parse_help "$1" || _parse_usage "$1")' -- "$cur"
-        ))
+        _comp_compgen_help || _comp_compgen_usage
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/iftop b/completions/iftop
index c273173dc70..7ebe6fb8fd2 100644
--- a/completions/iftop
+++ b/completions/iftop
@@ -19,7 +19,7 @@ _comp_cmd_iftop()
             ;;
     esac
 
-    COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
+    _comp_compgen_help -- -h
 } &&
     complete -F _comp_cmd_iftop iftop
 
diff --git a/completions/ifup b/completions/ifup
index 356c3f85632..f0268c29570 100644
--- a/completions/ifup
+++ b/completions/ifup
@@ -24,7 +24,7 @@ _comp_cmd_ifupdown()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         return
     fi
 
diff --git a/completions/influx b/completions/influx
index c916ee69625..31d55f0ed1e 100644
--- a/completions/influx
+++ b/completions/influx
@@ -28,7 +28,7 @@ _comp_cmd_influx()
     esac
 
     [[ $cur == -* ]] &&
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
 } &&
     complete -F _comp_cmd_influx influx
 
diff --git a/completions/info b/completions/info
index 520df74aca3..cbd1f71f3a2 100644
--- a/completions/info
+++ b/completions/info
@@ -36,7 +36,7 @@ _comp_cmd_info()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/inotifywait b/completions/inotifywait
index 6347170155c..b6bc1a2979e 100644
--- a/completions/inotifywait
+++ b/completions/inotifywait
@@ -38,7 +38,7 @@ _comp_cmd_inotifywait()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         return
     fi
 
diff --git a/completions/interdiff b/completions/interdiff
index 6023531d691..6f56e33aee4 100644
--- a/completions/interdiff
+++ b/completions/interdiff
@@ -16,7 +16,7 @@ _comp_cmd_interdiff()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/ipcalc b/completions/ipcalc
index 1b7b014f72d..979a8c246fd 100644
--- a/completions/ipcalc
+++ b/completions/ipcalc
@@ -18,7 +18,7 @@ _comp_cmd_ipcalc()
     done
 
     [[ $cur != -* ]] ||
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
 } &&
     complete -F _comp_cmd_ipcalc ipcalc
 
diff --git a/completions/ipmitool b/completions/ipmitool
index 29a13b75bda..b7424fb850f 100644
--- a/completions/ipmitool
+++ b/completions/ipmitool
@@ -58,7 +58,7 @@ _comp_cmd_ipmitool()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
+        _comp_compgen_help -- -h
         return
     fi
 
diff --git a/completions/isort b/completions/isort
index 7f353470398..300b817621d 100644
--- a/completions/isort
+++ b/completions/isort
@@ -30,7 +30,7 @@ _comp_cmd_isort()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         return
     fi
 
diff --git a/completions/java b/completions/java
index 13ebf49f1d4..1f33c5e90e4 100644
--- a/completions/java
+++ b/completions/java
@@ -225,9 +225,9 @@ _comp_cmd_java()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+        _comp_compgen_help -- -help
         [[ $cur == -X* ]] &&
-            COMPREPLY+=($(compgen -W '$(_parse_help "$1" -X)' -- "$cur"))
+            _comp_compgen -a help -- -X
     else
         if [[ $prev == -jar ]]; then
             # jar file completion
@@ -281,7 +281,7 @@ _comp_cmd_javadoc()
     fi
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+        _comp_compgen_help -- -help
     else
         # source files completion
         _comp_compgen_filedir java
@@ -321,9 +321,9 @@ _comp_cmd_javac()
     fi
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+        _comp_compgen_help -- -help
         [[ $cur == -X* ]] &&
-            COMPREPLY+=($(compgen -W '$(_parse_help "$1" -X)' -- "$cur"))
+            _comp_compgen -a help -- -X
     else
         # source files completion
         _comp_compgen_filedir java
diff --git a/completions/javaws b/completions/javaws
index 9bce088cf42..cd6c848136a 100644
--- a/completions/javaws
+++ b/completions/javaws
@@ -22,7 +22,7 @@ _comp_cmd_javaws()
     if [[ $cur == *= ]]; then
         return
     elif [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W "$(_parse_help "$1" -help) " -- "$cur"))
+        _comp_compgen_help -- -help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/jpegoptim b/completions/jpegoptim
index 0e102ad7d29..b6654f9d075 100644
--- a/completions/jpegoptim
+++ b/completions/jpegoptim
@@ -28,7 +28,7 @@ _comp_cmd_jpegoptim()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/jshint b/completions/jshint
index 35cdac982f9..bc5ca9680c4 100644
--- a/completions/jshint
+++ b/completions/jshint
@@ -26,7 +26,7 @@ _comp_cmd_jshint()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/jsonschema b/completions/jsonschema
index 8bdb3ccb779..cd3a8ff7fe5 100644
--- a/completions/jsonschema
+++ b/completions/jsonschema
@@ -16,7 +16,7 @@ _comp_cmd_jsonschema()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         return
     fi
 
diff --git a/completions/k3b b/completions/k3b
index da781b3aa15..45312e6c7e2 100644
--- a/completions/k3b
+++ b/completions/k3b
@@ -37,7 +37,7 @@ _comp_cmd_k3b()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W "$(_parse_help "$1")" -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         _comp_compgen_filedir
diff --git a/completions/kcov b/completions/kcov
index 110edb57126..180cfd76225 100644
--- a/completions/kcov
+++ b/completions/kcov
@@ -51,7 +51,7 @@ _comp_cmd_kcov()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" --help)' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/kill b/completions/kill
index 71e2072bad2..493d0c073fd 100644
--- a/completions/kill
+++ b/completions/kill
@@ -18,7 +18,7 @@ _comp_cmd_kill()
     if [[ $cword -eq 1 && $cur == -* ]]; then
         # return list of available signals
         _signals -
-        COMPREPLY+=($(compgen -W '$(_parse_help help "$1")' -- "$cur"))
+        _comp_compgen -a help -c help "$1"
     else
         # return list of available PIDs and jobs
         _pids
diff --git a/completions/killall b/completions/killall
index 38438f29908..9b35fad2866 100644
--- a/completions/killall
+++ b/completions/killall
@@ -26,7 +26,7 @@ _comp_cmd_killall()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         ((cword == 1)) && _signals -
         return
     fi
diff --git a/completions/koji b/completions/koji
index dc654729498..cccc74a9bf0 100644
--- a/completions/koji
+++ b/completions/koji
@@ -110,8 +110,7 @@ _comp_cmd_koji()
 
     if [[ $has_command ]]; then
         if [[ $cur == -* ]]; then
-            COMPREPLY=($(compgen -W \
-                '$(_parse_help "$1" "$command --help")' -- "$cur"))
+            _comp_compgen_help -- "$command" --help
             [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
             return
         fi
diff --git a/completions/lastlog b/completions/lastlog
index cb89b7902e4..25953a056fe 100644
--- a/completions/lastlog
+++ b/completions/lastlog
@@ -19,7 +19,7 @@ _comp_cmd_lastlog()
 
     [[ $was_split ]] && return
 
-    COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+    _comp_compgen_help
     [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 } &&
     complete -F _comp_cmd_lastlog lastlog
diff --git a/completions/ldapvi b/completions/ldapvi
index 535174cf43c..6db19b6a547 100644
--- a/completions/ldapvi
+++ b/completions/ldapvi
@@ -45,7 +45,7 @@ _comp_cmd_ldapvi()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
     fi
 } &&
     complete -F _comp_cmd_ldapvi ldapvi
diff --git a/completions/lftp b/completions/lftp
index 6c9f159c26f..ee1ec941d12 100644
--- a/completions/lftp
+++ b/completions/lftp
@@ -18,7 +18,7 @@ _comp_cmd_lftp()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         return
     fi
 
diff --git a/completions/lintian b/completions/lintian
index bcc5de24171..608047f28f4 100644
--- a/completions/lintian
+++ b/completions/lintian
@@ -173,7 +173,7 @@ _comp_cmd_lintian_info()
 
     case "$cur" in
         --*)
-            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+            _comp_compgen_help
             ;;
         *)
             _comp_compgen_filedir
diff --git a/completions/locale-gen b/completions/locale-gen
index 85303e86fe5..7a7609cd0a9 100644
--- a/completions/locale-gen
+++ b/completions/locale-gen
@@ -18,7 +18,7 @@ _comp_cmd_locale_gen()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/lrzip b/completions/lrzip
index 4c0d46a7f57..9ae9f955a18 100644
--- a/completions/lrzip
+++ b/completions/lrzip
@@ -40,7 +40,7 @@ _comp_cmd_lrzip()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         return
     fi
 
diff --git a/completions/lspci b/completions/lspci
index a0a3a9ec179..58c1ed560b3 100644
--- a/completions/lspci
+++ b/completions/lspci
@@ -33,7 +33,7 @@ _comp_cmd_lspci()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
     fi
 } &&
     complete -F _comp_cmd_lspci lspci
diff --git a/completions/lsscsi b/completions/lsscsi
index b1b49062d90..6f417f58d24 100644
--- a/completions/lsscsi
+++ b/completions/lsscsi
@@ -20,7 +20,7 @@ _comp_cmd_lsscsi()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
diff --git a/completions/lsusb b/completions/lsusb
index b003e6ab87a..44c26251fcf 100644
--- a/completions/lsusb
+++ b/completions/lsusb
@@ -14,7 +14,7 @@ _comp_cmd_lsusb()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
     fi
 } &&
     complete -F _comp_cmd_lsusb lsusb
diff --git a/completions/lua b/completions/lua
index 7cbe1cc6662..a8904e0b25b 100644
--- a/completions/lua
+++ b/completions/lua
@@ -12,7 +12,7 @@ _comp_cmd_lua()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W "$(_parse_help "$1")" -- "$cur"))
+        _comp_compgen_help
         return
     fi
 
diff --git a/completions/luac b/completions/luac
index 100839b904d..3fef4beea1c 100644
--- a/completions/luac
+++ b/completions/luac
@@ -16,7 +16,7 @@ _comp_cmd_luac()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W "$(_parse_help "$1")" -- "$cur"))
+        _comp_compgen_help
         return
     fi
 
diff --git a/completions/luseradd b/completions/luseradd
index ad2a6c69f09..874b70f10b7 100644
--- a/completions/luseradd
+++ b/completions/luseradd
@@ -30,7 +30,7 @@ _comp_cmd_luseradd()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/luserdel b/completions/luserdel
index 8d10c918e35..82fcbcaf44e 100644
--- a/completions/luserdel
+++ b/completions/luserdel
@@ -12,7 +12,7 @@ _comp_cmd_luserdel()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         return
     fi
 
diff --git a/completions/lvm b/completions/lvm
index 875d054d8a1..6aa1d7a47b1 100644
--- a/completions/lvm
+++ b/completions/lvm
@@ -70,7 +70,7 @@ _comp_cmd_lvmdiskscan()
     _comp_initialize -- "$@" || return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
+        _comp_compgen_usage -- --help
     fi
 } &&
     complete -F _comp_cmd_lvmdiskscan lvmdiskscan
@@ -81,7 +81,7 @@ _comp_cmd_pvscan()
     _comp_initialize -- "$@" || return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
+        _comp_compgen_usage -- --help
     fi
 } &&
     complete -F _comp_cmd_pvscan pvscan
@@ -106,7 +106,7 @@ _comp_cmd_pvs()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
+        _comp_compgen_usage -- --help
     else
         _comp_cmd_lvm__physicalvolumes_all
     fi
@@ -126,7 +126,7 @@ _comp_cmd_pvdisplay()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
+        _comp_compgen_usage -- --help
     else
         _comp_cmd_lvm__physicalvolumes_all
     fi
@@ -148,7 +148,7 @@ _comp_cmd_pvchange()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
+        _comp_compgen_usage -- --help
     else
         _comp_cmd_lvm__physicalvolumes_all
     fi
@@ -182,7 +182,7 @@ _comp_cmd_pvcreate()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
+        _comp_compgen_usage -- --help
     else
         _comp_cmd_lvm__filedir
     fi
@@ -208,7 +208,7 @@ _comp_cmd_pvmove()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
+        _comp_compgen_usage -- --help
     else
         _comp_cmd_lvm__physicalvolumes
     fi
@@ -221,7 +221,7 @@ _comp_cmd_pvremove()
     _comp_initialize -- "$@" || return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
+        _comp_compgen_usage -- --help
     else
         _comp_cmd_lvm__physicalvolumes_all
     fi
@@ -234,7 +234,7 @@ _comp_cmd_vgscan()
     _comp_initialize -- "$@" || return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
+        _comp_compgen_usage -- --help
     fi
 } &&
     complete -F _comp_cmd_vgscan vgscan
@@ -261,7 +261,7 @@ _comp_cmd_vgs()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
+        _comp_compgen_usage -- --help
     else
         _comp_cmd_lvm__volumegroups
     fi
@@ -281,7 +281,7 @@ _comp_cmd_vgdisplay()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
+        _comp_compgen_usage -- --help
     else
         _comp_cmd_lvm__volumegroups
     fi
@@ -303,7 +303,7 @@ _comp_cmd_vgchange()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
+        _comp_compgen_usage -- --help
     else
         _comp_cmd_lvm__volumegroups
     fi
@@ -333,7 +333,7 @@ _comp_cmd_vgcreate()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
+        _comp_compgen_usage -- --help
     else
         local ret
         _comp_cmd_lvm__count_args '@(-A|--autobackup|-M|--metadatatype|-s|--physicalextentsize)'
@@ -352,7 +352,7 @@ _comp_cmd_vgremove()
     _comp_initialize -- "$@" || return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
+        _comp_compgen_usage -- --help
     else
         _comp_cmd_lvm__volumegroups
     fi
@@ -374,7 +374,7 @@ _comp_cmd_vgrename()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
+        _comp_compgen_usage -- --help
     else
         _comp_cmd_lvm__volumegroups
     fi
@@ -396,7 +396,7 @@ _comp_cmd_vgreduce()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
+        _comp_compgen_usage -- --help
 
     else
         local ret
@@ -429,7 +429,7 @@ _comp_cmd_vgextend()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
+        _comp_compgen_usage -- --help
     else
         local ret
         _comp_cmd_lvm__count_args '@(-A|--autobackup|-L|--size)'
@@ -448,7 +448,7 @@ _comp_cmd_vgport()
     _comp_initialize -- "$@" || return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
+        _comp_compgen_usage -- --help
     else
         _comp_cmd_lvm__volumegroups
     fi
@@ -461,7 +461,7 @@ _comp_cmd_vgck()
     _comp_initialize -- "$@" || return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
+        _comp_compgen_usage -- --help
     else
         _comp_cmd_lvm__volumegroups
     fi
@@ -491,7 +491,7 @@ _comp_cmd_vgconvert()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
+        _comp_compgen_usage -- --help
     else
         _comp_cmd_lvm__volumegroups
     fi
@@ -513,7 +513,7 @@ _comp_cmd_vgcfgbackup()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
+        _comp_compgen_usage -- --help
     else
         _comp_cmd_lvm__volumegroups
     fi
@@ -543,7 +543,7 @@ _comp_cmd_vgcfgrestore()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
+        _comp_compgen_usage -- --help
     else
         _comp_cmd_lvm__volumegroups
     fi
@@ -565,7 +565,7 @@ _comp_cmd_vgmerge()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
+        _comp_compgen_usage -- --help
     else
         _comp_cmd_lvm__volumegroups
     fi
@@ -591,7 +591,7 @@ _comp_cmd_vgsplit()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
+        _comp_compgen_usage -- --help
     else
         local ret
         _comp_cmd_lvm__count_args '@(-A|--autobackup|-M|--metadatatype)'
@@ -610,7 +610,7 @@ _comp_cmd_vgmknodes()
     _comp_initialize -- "$@" || return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
+        _comp_compgen_usage -- --help
     else
         _comp_cmd_lvm__volumegroups
     fi
@@ -623,7 +623,7 @@ _comp_cmd_lvscan()
     _comp_initialize -- "$@" || return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
+        _comp_compgen_usage -- --help
     fi
 } &&
     complete -F _comp_cmd_lvscan lvscan
@@ -649,7 +649,7 @@ _comp_cmd_lvs()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
+        _comp_compgen_usage -- --help
     else
         _comp_cmd_lvm__logicalvolumes
     fi
@@ -669,7 +669,7 @@ _comp_cmd_lvdisplay()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
+        _comp_compgen_usage -- --help
     else
         _comp_cmd_lvm__logicalvolumes
     fi
@@ -695,7 +695,7 @@ _comp_cmd_lvchange()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
+        _comp_compgen_usage -- --help
     else
         _comp_cmd_lvm__logicalvolumes
     fi
@@ -729,7 +729,7 @@ _comp_cmd_lvcreate()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
+        _comp_compgen_usage -- --help
     else
         local ret
         _comp_cmd_lvm__count_args '@(-A|-C|-M|-Z|--autobackup|--contiguous|--persistent|--zero|-L|--size|-p|--permission|-n|--name)'
@@ -757,7 +757,7 @@ _comp_cmd_lvremove()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
+        _comp_compgen_usage -- --help
     else
         _comp_cmd_lvm__logicalvolumes
     fi
@@ -779,7 +779,7 @@ _comp_cmd_lvrename()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
+        _comp_compgen_usage -- --help
     else
         _comp_cmd_lvm__logicalvolumes
     fi
@@ -805,7 +805,7 @@ _comp_cmd_lvreduce()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
+        _comp_compgen_usage -- --help
     else
         _comp_cmd_lvm__logicalvolumes
     fi
@@ -831,7 +831,7 @@ _comp_cmd_lvresize()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
+        _comp_compgen_usage -- --help
     else
         local ret
         _comp_cmd_lvm__count_args '@(-A|--autobackup|-L|--size)'
@@ -863,7 +863,7 @@ _comp_cmd_lvextend()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
+        _comp_compgen_usage -- --help
     else
         local ret
         _comp_cmd_lvm__count_args '@(-A|--autobackup|-L|--size)'
diff --git a/completions/macof b/completions/macof
index 7617ac5f2bb..a4a3f7dd77d 100644
--- a/completions/macof
+++ b/completions/macof
@@ -13,7 +13,7 @@ _comp_cmd_macof()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
+        _comp_compgen_usage
     fi
 
 } &&
diff --git a/completions/make b/completions/make
index 4f3d28ddd3e..30da563cef3 100644
--- a/completions/make
+++ b/completions/make
@@ -173,9 +173,7 @@ _comp_cmd_make()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(
-            compgen -W '$(_parse_help "$1" || _parse_usage "$1")' -- "$cur"
-        ))
+        _comp_compgen_help || _comp_compgen_usage
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     elif [[ $cur == *=* ]]; then
         prev=${cur%%=*}
diff --git a/completions/man b/completions/man
index 7410691bdf6..6af77d2ef4c 100644
--- a/completions/man
+++ b/completions/man
@@ -46,9 +46,7 @@ _comp_cmd_man()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(
-            compgen -W '$(_parse_help "$1" -h || _parse_usage "$1")' -- "$cur"
-        ))
+        _comp_compgen_help -- -h || _comp_compgen_usage
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/mc b/completions/mc
index dadf40201f8..5ea242393ab 100644
--- a/completions/mc
+++ b/completions/mc
@@ -20,7 +20,7 @@ _comp_cmd_mc()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" --help-all)' -- "$cur"))
+        _comp_compgen_help -- --help-all
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         _comp_compgen_filedir -d
diff --git a/completions/mcrypt b/completions/mcrypt
index fcde2fd99c6..734d5a7bc58 100644
--- a/completions/mcrypt
+++ b/completions/mcrypt
@@ -45,7 +45,7 @@ _comp_cmd_mcrypt()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
     elif [[ ${words[0]} == mdecrypt ]]; then
         _comp_compgen_filedir nc
     else
diff --git a/completions/medusa b/completions/medusa
index 27bbd935db3..fde8539fb45 100644
--- a/completions/medusa
+++ b/completions/medusa
@@ -22,7 +22,7 @@ _comp_cmd_medusa()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
     fi
 } &&
     complete -F _comp_cmd_medusa medusa
diff --git a/completions/mii-diag b/completions/mii-diag
index 580be229aba..3b803a04bfc 100644
--- a/completions/mii-diag
+++ b/completions/mii-diag
@@ -16,7 +16,7 @@ _comp_cmd_mii_diag()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
     else
         _available_interfaces -a
     fi
diff --git a/completions/mii-tool b/completions/mii-tool
index 29dafb78a44..fff11b7fdc4 100644
--- a/completions/mii-tool
+++ b/completions/mii-tool
@@ -23,7 +23,7 @@ _comp_cmd_mii_tool()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         _available_interfaces -a
diff --git a/completions/minicom b/completions/minicom
index 2b0986308b4..e70689ba0eb 100644
--- a/completions/minicom
+++ b/completions/minicom
@@ -28,7 +28,7 @@ _comp_cmd_minicom()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/modinfo b/completions/modinfo
index 9060a14ab09..bcb0969393c 100644
--- a/completions/modinfo
+++ b/completions/modinfo
@@ -28,9 +28,7 @@ _comp_cmd_modinfo()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(
-            compgen -W '$(_parse_help "$1" || _parse_usage "$1")' -- "$cur"
-        ))
+        _comp_compgen_help || _comp_compgen_usage
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/modprobe b/completions/modprobe
index cc4891e3f4e..871e1f180fc 100644
--- a/completions/modprobe
+++ b/completions/modprobe
@@ -28,7 +28,7 @@ _comp_cmd_modprobe()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         if [[ ! ${COMPREPLY-} ]]; then
             COMPREPLY=($(compgen -W '-a --all -b --use-blacklist -C --config
                 -c --showconfig --dump-modversions -d --dirname --first-time
diff --git a/completions/monodevelop b/completions/monodevelop
index 6394561977d..6e60bfe6c89 100644
--- a/completions/monodevelop
+++ b/completions/monodevelop
@@ -8,7 +8,7 @@ _comp_cmd_monodevelop()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
+        _comp_compgen_help -- -h
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         _comp_compgen_filedir
diff --git a/completions/munin-node-configure b/completions/munin-node-configure
index c254acef3bc..44cbb32c524 100644
--- a/completions/munin-node-configure
+++ b/completions/munin-node-configure
@@ -25,7 +25,7 @@ _comp_cmd_munin_node_configure()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
     fi
 } &&
     complete -F _comp_cmd_munin_node_configure munin-node-configure
diff --git a/completions/munin-run b/completions/munin-run
index c7f0770cdd5..f781bcf5a9e 100644
--- a/completions/munin-run
+++ b/completions/munin-run
@@ -17,7 +17,7 @@ _comp_cmd_munin_run()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
     else
         COMPREPLY=($(compgen -W \
             '$(command ls /etc/munin/plugins 2>/dev/null)' -- "$cur"))
diff --git a/completions/mussh b/completions/mussh
index b777d62cc0b..cd329dd66e6 100644
--- a/completions/mussh
+++ b/completions/mussh
@@ -45,7 +45,7 @@ _comp_cmd_mussh()
     esac
 
     [[ $cur != -* ]] ||
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
 } &&
     complete -F _comp_cmd_mussh mussh
 
diff --git a/completions/mypy b/completions/mypy
index 4e0fa12fa09..6f18a98230a 100644
--- a/completions/mypy
+++ b/completions/mypy
@@ -49,7 +49,7 @@ _comp_cmd_mypy()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         return
     fi
 
diff --git a/completions/mysqladmin b/completions/mysqladmin
index b4f7ea73ee8..35c34788ade 100644
--- a/completions/mysqladmin
+++ b/completions/mysqladmin
@@ -51,7 +51,7 @@ _comp_cmd_mysqladmin()
 
     [[ $was_split ]] && return
 
-    COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+    _comp_compgen_help
 
     COMPREPLY+=($(compgen -W 'create debug drop extended-status flush-hosts
         flush-logs flush-status flush-tables flush-threads flush-privileges
diff --git a/completions/nc b/completions/nc
index 90ae9544db6..8a099934f27 100644
--- a/completions/nc
+++ b/completions/nc
@@ -35,7 +35,7 @@ _comp_cmd_nc()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
+        _comp_compgen_help -- -h
         return
     fi
 
diff --git a/completions/ncftp b/completions/ncftp
index 635ed999088..89e8c72d92e 100644
--- a/completions/ncftp
+++ b/completions/ncftp
@@ -12,7 +12,7 @@ _comp_cmd_ncftp()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
+        _comp_compgen_help -- -h
         return
     fi
 
diff --git a/completions/nethogs b/completions/nethogs
index b74d5a3ba37..20af9584d0f 100644
--- a/completions/nethogs
+++ b/completions/nethogs
@@ -15,7 +15,7 @@ _comp_cmd_nethogs()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1" -h)' -- "$cur"))
+        _comp_compgen_usage -- -h
         return
     fi
 
diff --git a/completions/newlist b/completions/newlist
index c24aa9795c2..fa73855acf5 100644
--- a/completions/newlist
+++ b/completions/newlist
@@ -14,7 +14,7 @@ _comp_cmd_newlist()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         _comp_xfunc list_lists mailman_lists
diff --git a/completions/newusers b/completions/newusers
index a2169888770..a7b89bef694 100644
--- a/completions/newusers
+++ b/completions/newusers
@@ -18,7 +18,7 @@ _comp_cmd_newusers()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/ngrep b/completions/ngrep
index d9a8ee6aadc..ee65be30784 100644
--- a/completions/ngrep
+++ b/completions/ngrep
@@ -29,7 +29,7 @@ _comp_cmd_ngrep()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
+        _comp_compgen_help -- -h
         return
     fi
 } &&
diff --git a/completions/nproc b/completions/nproc
index 34fc94e47f8..dc38944e6e1 100644
--- a/completions/nproc
+++ b/completions/nproc
@@ -14,7 +14,7 @@ _comp_cmd_nproc()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
diff --git a/completions/nslookup b/completions/nslookup
index 8b7b59e7488..b2b9af362bd 100644
--- a/completions/nslookup
+++ b/completions/nslookup
@@ -85,7 +85,7 @@ _comp_cmd_host()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
+        _comp_compgen_usage
         return
     fi
 
diff --git a/completions/nsupdate b/completions/nsupdate
index 4ef9c4b3f9e..b23cfea8faf 100644
--- a/completions/nsupdate
+++ b/completions/nsupdate
@@ -28,7 +28,7 @@ _comp_cmd_nsupdate()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
+        _comp_compgen_usage
         return
     fi
 
diff --git a/completions/ntpdate b/completions/ntpdate
index 0ac1ed389d7..d06f473a85c 100644
--- a/completions/ntpdate
+++ b/completions/ntpdate
@@ -25,9 +25,7 @@ _comp_cmd_ntpdate()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(
-            compgen -W '$(_parse_help "$1" -h || _parse_usage "$1")' -- "$cur"
-        ))
+        _comp_compgen_help -- -h || _comp_compgen_usage
     else
         _known_hosts_real -- "$cur"
     fi
diff --git a/completions/oggdec b/completions/oggdec
index 19ef8c10d64..4b72bed26eb 100644
--- a/completions/oggdec
+++ b/completions/oggdec
@@ -28,7 +28,7 @@ _comp_cmd_oggdec()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/opera b/completions/opera
index 50697b48e80..f7655a62148 100644
--- a/completions/opera
+++ b/completions/opera
@@ -35,7 +35,7 @@ _comp_cmd_opera()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+        _comp_compgen_help -- -help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/optipng b/completions/optipng
index dae68e16164..86e66aa2898 100644
--- a/completions/optipng
+++ b/completions/optipng
@@ -41,7 +41,7 @@ _comp_cmd_optipng()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         return
     fi
 
diff --git a/completions/passwd b/completions/passwd
index ed3eed254d4..ca7040b3907 100644
--- a/completions/passwd
+++ b/completions/passwd
@@ -15,9 +15,7 @@ _comp_cmd_passwd()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(
-            compgen -W '$(_parse_help "$1" || _parse_usage "$1")' -- "$cur"
-        ))
+        _comp_compgen_help || _comp_compgen_usage
         return
     fi
 
diff --git a/completions/patch b/completions/patch
index 995906238a6..474d982f969 100644
--- a/completions/patch
+++ b/completions/patch
@@ -51,7 +51,7 @@ _comp_cmd_patch()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/pdftoppm b/completions/pdftoppm
index 13e72ad5dca..0934e37a03d 100644
--- a/completions/pdftoppm
+++ b/completions/pdftoppm
@@ -24,7 +24,7 @@ _comp_cmd_pdftoppm()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         return
     fi
 
diff --git a/completions/pdftotext b/completions/pdftotext
index a79e12c1e3b..8d0cd61db0f 100644
--- a/completions/pdftotext
+++ b/completions/pdftotext
@@ -22,7 +22,7 @@ _comp_cmd_pdftotext()
     esac
 
     if [[ $cur == -* && ${prev,,} != *.pdf ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         return
     fi
 
diff --git a/completions/perl b/completions/perl
index e0e9ad95fde..5b6167ae520 100644
--- a/completions/perl
+++ b/completions/perl
@@ -126,7 +126,7 @@ _comp_cmd_perldoc()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
+        _comp_compgen_help -- -h
     else
         # return available modules (unless it is clearly a file)
         if [[ $cur != @(*/|[.~])* ]]; then
diff --git a/completions/perlcritic b/completions/perlcritic
index 42385c83377..8ff9ebf127b 100644
--- a/completions/perlcritic
+++ b/completions/perlcritic
@@ -40,7 +40,7 @@ _comp_cmd_perlcritic()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
+        _comp_compgen_usage
         return
     fi
 
diff --git a/completions/perltidy b/completions/perltidy
index 4c5e7c2f39f..4603db48c39 100644
--- a/completions/perltidy
+++ b/completions/perltidy
@@ -52,7 +52,7 @@ _comp_cmd_perltidy()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         _comp_compgen_filedir 'p[lm]|t'
diff --git a/completions/pidof b/completions/pidof
index 5fcff64e663..e6cfb73147e 100644
--- a/completions/pidof
+++ b/completions/pidof
@@ -18,7 +18,7 @@ _comp_cmd_pidof()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         return
     fi
 
diff --git a/completions/pine b/completions/pine
index 7f8edf3cf12..5ceddda0ccb 100644
--- a/completions/pine
+++ b/completions/pine
@@ -22,7 +22,7 @@ _comp_cmd_pine()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
+        _comp_compgen_help -- -h
     else
         COMPREPLY=($(compgen -W '$(awk "{print \$1}" ~/.addressbook \
             2>/dev/null)' -- "$cur"))
diff --git a/completions/ping b/completions/ping
index 9e01a34f32e..58e608108ea 100644
--- a/completions/ping
+++ b/completions/ping
@@ -58,9 +58,7 @@ _comp_cmd_ping()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(
-            compgen -W '$(_parse_help "$1" || _parse_usage "$1")' -- "$cur"
-        ))
+        _comp_compgen_help || _comp_compgen_usage
         return
     fi
 
diff --git a/completions/pkg-config b/completions/pkg-config
index b5ea16a3f50..0535ee5975b 100644
--- a/completions/pkg-config
+++ b/completions/pkg-config
@@ -32,7 +32,7 @@ _comp_cmd_pkg_config()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         COMPREPLY=($(compgen -W "$("$1" --list-all \
diff --git a/completions/pngfix b/completions/pngfix
index ff7943c29ff..d638ccef0d5 100644
--- a/completions/pngfix
+++ b/completions/pngfix
@@ -24,7 +24,7 @@ _comp_cmd_pngfix()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/postcat b/completions/postcat
index 34dfea9c91c..aeadb842163 100644
--- a/completions/postcat
+++ b/completions/postcat
@@ -13,7 +13,7 @@ _comp_cmd_postcat()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
+        _comp_compgen_usage
         return
     fi
 
diff --git a/completions/postconf b/completions/postconf
index dcdf56ba966..ac1b21b39b1 100644
--- a/completions/postconf
+++ b/completions/postconf
@@ -23,7 +23,7 @@ _comp_cmd_postconf()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
+        _comp_compgen_usage
         return
     fi
 
diff --git a/completions/postfix b/completions/postfix
index cb7b606fff3..3391a654274 100644
--- a/completions/postfix
+++ b/completions/postfix
@@ -17,8 +17,7 @@ _comp_cmd_postfix()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W \
-            '$(_parse_usage _bashcomp_try_faketty "$1 --help")' -- "$cur"))
+        _comp_compgen_usage -c _bashcomp_try_faketty "$1" --help
         return
     fi
 
diff --git a/completions/postmap b/completions/postmap
index aa6b8d7c8f0..aa0a661fb00 100644
--- a/completions/postmap
+++ b/completions/postmap
@@ -16,7 +16,7 @@ _comp_cmd_postmap()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
+        _comp_compgen_usage
         return
     fi
 
diff --git a/completions/postsuper b/completions/postsuper
index 6420c23048a..1f4055021cb 100644
--- a/completions/postsuper
+++ b/completions/postsuper
@@ -46,7 +46,7 @@ _comp_cmd_postsuper()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         return
     fi
 
diff --git a/completions/prelink b/completions/prelink
index c140e9e2e1e..51b1cd9c2c8 100644
--- a/completions/prelink
+++ b/completions/prelink
@@ -30,7 +30,7 @@ _comp_cmd_prelink()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/printenv b/completions/printenv
index 526f1a0cab0..41bd3faa8d9 100644
--- a/completions/printenv
+++ b/completions/printenv
@@ -12,7 +12,7 @@ _comp_cmd_printenv()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         return
     fi
 
diff --git a/completions/protoc b/completions/protoc
index d275c73bfb8..a4581c1f1d5 100644
--- a/completions/protoc
+++ b/completions/protoc
@@ -44,7 +44,7 @@ _comp_cmd_protoc()
             return
             ;;
         -*)
-            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+            _comp_compgen_help
             local i
             for i in "${!COMPREPLY[@]}"; do
                 [[ ${COMPREPLY[i]} == -oFILE ]] && unset -v 'COMPREPLY[i]'
diff --git a/completions/psql b/completions/psql
index 01d59b9c36c..0f689f7a7cd 100644
--- a/completions/psql
+++ b/completions/psql
@@ -43,7 +43,7 @@ _comp_cmd_createdb()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         _comp_cmd_psql__databases
@@ -77,7 +77,7 @@ _comp_cmd_createuser()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
@@ -109,7 +109,7 @@ _comp_cmd_dropdb()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         _comp_cmd_psql__databases
@@ -143,7 +143,7 @@ _comp_cmd_dropuser()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         _comp_cmd_psql__users
@@ -188,7 +188,7 @@ _comp_cmd_psql()
 
     if [[ $cur == -* ]]; then
         # return list of available options
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         # return list of available databases
diff --git a/completions/puppet b/completions/puppet
index 0e5bb0d17db..6d4dd49fde5 100644
--- a/completions/puppet
+++ b/completions/puppet
@@ -56,8 +56,7 @@ _comp_cmd_puppet__subcmd_opts()
 {
     # puppet cmd help is somewhat slow, avoid if possible
     [[ ! $cur || $cur == -* ]] &&
-        COMPREPLY+=($(compgen -W \
-            '$(_parse_usage "$1" "help $2")' -- "$cur"))
+        _comp_compgen -a usage -- help ${2:+"$2"}
 }
 
 _comp_cmd_puppet()
@@ -65,7 +64,7 @@ _comp_cmd_puppet()
     local cur prev words cword comp_args
     _comp_initialize -- "$@" || return
 
-    local subcommand action
+    local subcommand="" action
 
     case $prev in
         -h | --help | -V | --version)
@@ -338,7 +337,7 @@ _comp_cmd_puppet()
             esac
             ;;
         resource | *)
-            _comp_cmd_puppet__subcmd_opts "$1" "$subcommand"
+            _comp_cmd_puppet__subcmd_opts "$1" ${subcommand:+"$subcommand"}
             return
             ;;
     esac
diff --git a/completions/pv b/completions/pv
index e8e45aab928..ef79fd24350 100644
--- a/completions/pv
+++ b/completions/pv
@@ -24,7 +24,7 @@ _comp_cmd_pv()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
     else
         _comp_compgen_filedir
     fi
diff --git a/completions/pwck b/completions/pwck
index ef636144a62..3e74ea5e3b9 100644
--- a/completions/pwck
+++ b/completions/pwck
@@ -6,9 +6,7 @@ _comp_cmd_pwck()
     _comp_initialize -- "$@" || return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(
-            compgen -W '$(_parse_help "$1" || _parse_usage "$1")' -- "$cur"
-        ))
+        _comp_compgen_help || _comp_compgen_usage
         return
     fi
 
diff --git a/completions/pwd b/completions/pwd
index f3bba5e122a..159dacc92e2 100644
--- a/completions/pwd
+++ b/completions/pwd
@@ -11,7 +11,7 @@ _comp_cmd_pwd()
             ;;
     esac
 
-    COMPREPLY=($(compgen -W '$(_parse_usage help "-s $1")' -- "$cur"))
+    _comp_compgen_usage -c help -s "$1"
 } &&
     complete -F _comp_cmd_pwd pwd
 
diff --git a/completions/pwgen b/completions/pwgen
index b2730466b64..515ef1cf348 100644
--- a/completions/pwgen
+++ b/completions/pwgen
@@ -20,7 +20,7 @@ _comp_cmd_pwgen()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/pycodestyle b/completions/pycodestyle
index 3034611c475..a3455d2ae6b 100644
--- a/completions/pycodestyle
+++ b/completions/pycodestyle
@@ -22,7 +22,7 @@ _comp_cmd_pycodestyle()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/pydocstyle b/completions/pydocstyle
index 58791edceaf..52ceaf92441 100644
--- a/completions/pydocstyle
+++ b/completions/pydocstyle
@@ -23,7 +23,7 @@ _comp_cmd_pydocstyle()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/pyflakes b/completions/pyflakes
index 18139bce545..a53904ea402 100644
--- a/completions/pyflakes
+++ b/completions/pyflakes
@@ -12,7 +12,7 @@ _comp_cmd_pyflakes()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         return
     fi
 
diff --git a/completions/pylint b/completions/pylint
index 5698b8f12ad..2ec431603e5 100644
--- a/completions/pylint
+++ b/completions/pylint
@@ -103,8 +103,7 @@ _comp_cmd_pylint()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W \
-            '$(_parse_help "$1" --long-help)' -- "$cur"))
+        _comp_compgen_help -- --long-help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/pytest b/completions/pytest
index 62e41ea09ff..2aa405e47ba 100644
--- a/completions/pytest
+++ b/completions/pytest
@@ -96,7 +96,7 @@ _comp_cmd_pytest()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/querybts b/completions/querybts
index 95358d4647e..62116d4194a 100644
--- a/completions/querybts
+++ b/completions/querybts
@@ -27,7 +27,7 @@ _comp_cmd_querybts()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         COMPREPLY=($(compgen -W 'wnpp boot-floppies kernel bugs.debian.org
diff --git a/completions/quota b/completions/quota
index 99303b826f2..6af43256087 100644
--- a/completions/quota
+++ b/completions/quota
@@ -18,9 +18,7 @@ _comp_cmd_quota__user_or_group()
 
 _comp_cmd_quota__parse_help()
 {
-    COMPREPLY=($(
-        compgen -W '$(_parse_help "$1" || _parse_usage "$1")' -- "$cur"
-    ))
+    _comp_compgen_help || _comp_compgen_usage
     [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 }
 
diff --git a/completions/radvdump b/completions/radvdump
index 99c83b451d7..e2fd1751f68 100644
--- a/completions/radvdump
+++ b/completions/radvdump
@@ -15,7 +15,7 @@ _comp_cmd_radvdump()
             ;;
     esac
 
-    COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
+    _comp_compgen_usage -- --help
 } &&
     complete -F _comp_cmd_radvdump radvdump
 
diff --git a/completions/reportbug b/completions/reportbug
index b06c1e54abb..9917fb50dcb 100644
--- a/completions/reportbug
+++ b/completions/reportbug
@@ -60,7 +60,7 @@ _comp_cmd_reportbug()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == -*= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/ri b/completions/ri
index 6142f00dbb5..3062d0585c9 100644
--- a/completions/ri
+++ b/completions/ri
@@ -61,7 +61,7 @@ _comp_cmd_ri()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/rmmod b/completions/rmmod
index 7a41e061f68..461fb067811 100644
--- a/completions/rmmod
+++ b/completions/rmmod
@@ -13,7 +13,7 @@ _comp_cmd_rmmod()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         return
     fi
 
diff --git a/completions/rpm b/completions/rpm
index 851558b1ece..73697068480 100644
--- a/completions/rpm
+++ b/completions/rpm
@@ -281,7 +281,7 @@ _comp_cmd_rpmbuild()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W "$(_parse_help "$1")" -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/sbopkg b/completions/sbopkg
index 7699002103a..36a8da9dd01 100644
--- a/completions/sbopkg
+++ b/completions/sbopkg
@@ -6,7 +6,7 @@ _comp_cmd_sbopkg()
     _comp_initialize -- "$@" || return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
+        _comp_compgen_help -- -h
         [[ ${COMPREPLY-} ]] && return
     fi
 
diff --git a/completions/screen b/completions/screen
index 63e174f4732..aac7df25838 100644
--- a/completions/screen
+++ b/completions/screen
@@ -113,7 +113,7 @@ _comp_cmd_screen__sessions()
         esac
 
         if [[ $cur == -* ]]; then
-            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+            _comp_compgen_help
         fi
     } &&
         complete -F _comp_cmd_screen screen
diff --git a/completions/scrub b/completions/scrub
index 58190e99c7e..1622bad89cf 100644
--- a/completions/scrub
+++ b/completions/scrub
@@ -27,7 +27,7 @@ _comp_cmd_scrub()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/shellcheck b/completions/shellcheck
index 0c7d0250cf2..b3d3c87e6de 100644
--- a/completions/shellcheck
+++ b/completions/shellcheck
@@ -53,7 +53,7 @@ _comp_cmd_shellcheck()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/sitecopy b/completions/sitecopy
index 328965a2aec..75099edf2c5 100644
--- a/completions/sitecopy
+++ b/completions/sitecopy
@@ -29,7 +29,7 @@ _comp_cmd_sitecopy()
 
     case $cur in
         --*)
-            COMPREPLY=($(compgen -W "$(_parse_help "$1")" -- "$cur"))
+            _comp_compgen_help
             [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
             return
             ;;
diff --git a/completions/slapt-get b/completions/slapt-get
index 5f9b23d1ccc..5a1c2f03235 100644
--- a/completions/slapt-get
+++ b/completions/slapt-get
@@ -17,7 +17,7 @@ _comp_cmd_slapt_get()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" --help)' -- "$cur"))
+        _comp_compgen_help
         if [[ ${COMPREPLY-} ]]; then
             [[ $COMPREPLY == *= ]] && compopt -o nospace
             return
diff --git a/completions/slapt-src b/completions/slapt-src
index 972b42cea1e..5a1bb6e94e5 100644
--- a/completions/slapt-src
+++ b/completions/slapt-src
@@ -19,7 +19,7 @@ _comp_cmd_slapt_src()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" --help)' -- "$cur"))
+        _comp_compgen_help
         if [[ ${COMPREPLY-} ]]; then
             [[ $COMPREPLY == *= ]] && compopt -o nospace
             return
diff --git a/completions/smartctl b/completions/smartctl
index db5b756b73b..7b5a97a358e 100644
--- a/completions/smartctl
+++ b/completions/smartctl
@@ -121,7 +121,7 @@ _comp_cmd_smartctl()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         _comp_compgen -c "${cur:-/dev/}" filedir
diff --git a/completions/smbclient b/completions/smbclient
index 8938964f3e8..848db4cf810 100644
--- a/completions/smbclient
+++ b/completions/smbclient
@@ -101,7 +101,7 @@ _comp_cmd_smbclient()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
@@ -135,7 +135,7 @@ _comp_cmd_smbget()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
@@ -182,7 +182,7 @@ _comp_cmd_smbcacls()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
@@ -220,7 +220,7 @@ _comp_cmd_smbcquotas()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
@@ -254,7 +254,7 @@ _comp_cmd_smbpasswd()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
+        _comp_compgen_help -- -h
     fi
 } &&
     complete -F _comp_cmd_smbpasswd smbpasswd
@@ -287,7 +287,7 @@ _comp_cmd_smbtar()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
     fi
 } &&
     complete -F _comp_cmd_smbtar smbtar
@@ -324,7 +324,7 @@ _comp_cmd_smbtree()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
diff --git a/completions/snownews b/completions/snownews
index a2cffc29438..a767a6c8b01 100644
--- a/completions/snownews
+++ b/completions/snownews
@@ -7,7 +7,7 @@ _comp_cmd_snownews()
 
     if [[ $cur == -* ]]; then
         # return list of available options
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
     fi
 } &&
     complete -F _comp_cmd_snownews snownews
diff --git a/completions/sqlite3 b/completions/sqlite3
index f6e69d9609f..0bf0e5ed4ef 100644
--- a/completions/sqlite3
+++ b/completions/sqlite3
@@ -27,7 +27,7 @@ _comp_cmd_sqlite3()
         return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+        _comp_compgen_help -- -help
         return
     fi
 
diff --git a/completions/ss b/completions/ss
index 5aefde45792..4a8ac4770c0 100644
--- a/completions/ss
+++ b/completions/ss
@@ -30,7 +30,7 @@ _comp_cmd_ss()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     elif [[ $prev == state ]]; then
         COMPREPLY=($(compgen -W 'all connected synchronized bucket big
diff --git a/completions/ssh b/completions/ssh
index 78e632de21e..cefab8988df 100644
--- a/completions/ssh
+++ b/completions/ssh
@@ -345,7 +345,7 @@ _comp_cmd_ssh()
         # Prefix completions with '-F'
         COMPREPLY=("${COMPREPLY[@]/#/-F}")
     elif [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
+        _comp_compgen_usage
     else
         local args
         # Keep glob sort in sync with cases above
@@ -418,7 +418,7 @@ _comp_cmd_sftp()
         # Prefix completions with '-F'
         COMPREPLY=("${COMPREPLY[@]/#/-F}")
     elif [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
+        _comp_compgen_usage
     else
         _known_hosts_real ${ipvx:+"$ipvx"} -a ${configfile:+-F "$configfile"} -- "$cur"
     fi
@@ -575,8 +575,7 @@ _comp_cmd_scp()
     else
         case $cur in
             -*)
-                COMPREPLY=($(compgen -W '$(_parse_usage "${words[0]}")' \
-                    -- "$cur"))
+                _comp_compgen_usage
                 COMPREPLY=("${COMPREPLY[@]/%/ }")
                 return
                 ;;
diff --git a/completions/ssh-add b/completions/ssh-add
index b027b6692a8..79989720133 100644
--- a/completions/ssh-add
+++ b/completions/ssh-add
@@ -24,7 +24,7 @@ _comp_cmd_ssh_add()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" "-\?")' -- "$cur"))
+        _comp_compgen_help -- '-?'
         return
     fi
 
diff --git a/completions/ssh-copy-id b/completions/ssh-copy-id
index 3b440801b40..6ecc922012a 100644
--- a/completions/ssh-copy-id
+++ b/completions/ssh-copy-id
@@ -22,7 +22,7 @@ _comp_cmd_ssh_copy_id()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
+        _comp_compgen_usage -- --help
     else
         _known_hosts_real -a -- "$cur"
     fi
diff --git a/completions/ssh-keyscan b/completions/ssh-keyscan
index efb34f70177..f88c13a7dbf 100644
--- a/completions/ssh-keyscan
+++ b/completions/ssh-keyscan
@@ -28,7 +28,7 @@ _comp_cmd_ssh_keyscan()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
+        _comp_compgen_usage
         return
     fi
 
diff --git a/completions/sshmitm b/completions/sshmitm
index 2d6758c0e0a..4b14301f574 100644
--- a/completions/sshmitm
+++ b/completions/sshmitm
@@ -6,7 +6,7 @@ _comp_cmd_sshmitm()
     _comp_initialize -- "$@" || return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
+        _comp_compgen_usage
     else
         _known_hosts_real -- "$cur"
     fi
diff --git a/completions/sshow b/completions/sshow
index b3deddfe4a1..202162f1a7d 100644
--- a/completions/sshow
+++ b/completions/sshow
@@ -17,7 +17,7 @@ _comp_cmd_sshow()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
+        _comp_compgen_usage
     fi
 
 } &&
diff --git a/completions/strace b/completions/strace
index 3323e394d2d..239ccf825c2 100644
--- a/completions/strace
+++ b/completions/strace
@@ -88,7 +88,7 @@ _comp_cmd_strace()
         esac
 
         if [[ $cur == -* ]]; then
-            COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
+            _comp_compgen_help -- -h
         else
             COMPREPLY=($(compgen -c -- "$cur"))
         fi
diff --git a/completions/sudo b/completions/sudo
index 542770a8834..fc21bdb2c50 100644
--- a/completions/sudo
+++ b/completions/sudo
@@ -45,9 +45,7 @@ _comp_cmd_sudo()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(
-            compgen -W '$(_parse_help "$1" || _parse_usage "$1")' -- "$cur"
-        ))
+        _comp_compgen_help || _comp_compgen_usage
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/synclient b/completions/synclient
index 1c68b4f8484..1452d345ca6 100644
--- a/completions/synclient
+++ b/completions/synclient
@@ -12,7 +12,7 @@ _comp_cmd_synclient()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
+        _comp_compgen_usage
     elif [[ $cur != *=?* ]]; then
         COMPREPLY=($(compgen -S = -W '$("$1" -l 2>/dev/null | \
             awk "/^[ \t]/ { print \$1 }")' -- "$cur"))
diff --git a/completions/sysctl b/completions/sysctl
index 22788a14f41..e0024e26b86 100644
--- a/completions/sysctl
+++ b/completions/sysctl
@@ -18,9 +18,7 @@ _comp_cmd_sysctl()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(
-            compgen -W '$(_parse_help "$1" || _parse_usage "$1")' -- "$cur"
-        ))
+        _comp_compgen_help || _comp_compgen_usage
     else
         local suffix=
         [[ $prev == -w ]] && suffix="="
diff --git a/completions/tcpdump b/completions/tcpdump
index 04c2f7ab2c6..1122ec2705b 100644
--- a/completions/tcpdump
+++ b/completions/tcpdump
@@ -56,7 +56,7 @@ _comp_cmd_tcpdump()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
+        _comp_compgen_usage
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 
diff --git a/completions/tcpnice b/completions/tcpnice
index a882036d8eb..d35c753cc45 100644
--- a/completions/tcpnice
+++ b/completions/tcpnice
@@ -13,7 +13,7 @@ _comp_cmd_tcpnice()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
+        _comp_compgen_usage
     fi
 
 } &&
diff --git a/completions/timeout b/completions/timeout
index 1f6348b445f..e62058d4f3c 100644
--- a/completions/timeout
+++ b/completions/timeout
@@ -32,9 +32,7 @@ _comp_cmd_timeout()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(
-            compgen -W '$(_parse_help "$1" || _parse_usage "$1")' -- "$cur"
-        ))
+        _comp_compgen_help || _comp_compgen_usage
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
diff --git a/completions/tracepath b/completions/tracepath
index 4ee85a1c29d..f6a57db289d 100644
--- a/completions/tracepath
+++ b/completions/tracepath
@@ -12,9 +12,7 @@ _comp_cmd_tracepath()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(
-            compgen -W '$(_parse_help "$1" || _parse_usage "$1")' -- "$cur"
-        ))
+        _comp_compgen_help || _comp_compgen_usage
         return
     fi
 
diff --git a/completions/tree b/completions/tree
index 4b7a6ddc914..de195d36652 100644
--- a/completions/tree
+++ b/completions/tree
@@ -28,7 +28,7 @@ _comp_cmd_tree()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         return
     fi
 
diff --git a/completions/truncate b/completions/truncate
index 57544a234bb..94534a285bc 100644
--- a/completions/truncate
+++ b/completions/truncate
@@ -20,7 +20,7 @@ _comp_cmd_truncate()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/tshark b/completions/tshark
index 3191bb214fc..69aeeb22a5f 100644
--- a/completions/tshark
+++ b/completions/tshark
@@ -124,8 +124,7 @@ _comp_cmd_tshark()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h 2>/dev/null)' \
-            -- "$cur"))
+        _comp_compgen_help -- -h
         return
     fi
 } &&
diff --git a/completions/tsig-keygen b/completions/tsig-keygen
index fb9887e249f..3a64ff2ea64 100644
--- a/completions/tsig-keygen
+++ b/completions/tsig-keygen
@@ -23,7 +23,7 @@ _comp_cmd_tsig_keygen()
     esac
 
     [[ $cur != -* ]] ||
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
 } &&
     complete -F _comp_cmd_tsig_keygen tsig-keygen
 
diff --git a/completions/tune2fs b/completions/tune2fs
index 902d5b3b228..4daf3dd611f 100644
--- a/completions/tune2fs
+++ b/completions/tune2fs
@@ -51,7 +51,7 @@ _comp_cmd_tune2fs()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
+        _comp_compgen_usage
         return
     fi
 
diff --git a/completions/ulimit b/completions/ulimit
index 107c9554eb5..3d4331fbf97 100644
--- a/completions/ulimit
+++ b/completions/ulimit
@@ -27,7 +27,7 @@ _comp_cmd_ulimit()
         done
 
         if [[ $cur == -* ]]; then
-            COMPREPLY=($(compgen -W '$(_parse_usage help "-s $1")' -- "$cur"))
+            _comp_compgen_usage -c help -s "$1"
             return
         fi
     fi
diff --git a/completions/unshunt b/completions/unshunt
index 3a7078f2c34..0486d1fca47 100644
--- a/completions/unshunt
+++ b/completions/unshunt
@@ -6,7 +6,7 @@ _comp_cmd_unshunt()
     _comp_initialize -- "$@" || return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
     else
         _comp_compgen_filedir -d
     fi
diff --git a/completions/update-alternatives b/completions/update-alternatives
index 06352b8aeaa..963602bdc7a 100644
--- a/completions/update-alternatives
+++ b/completions/update-alternatives
@@ -83,7 +83,7 @@ _comp_cmd_update_alternatives()
             _comp_cmd_update_alternatives__installed
             ;;
         *)
-            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+            _comp_compgen_help
             ;;
     esac
 } &&
diff --git a/completions/urlsnarf b/completions/urlsnarf
index 7cc0bbc6a55..90be5d92248 100644
--- a/completions/urlsnarf
+++ b/completions/urlsnarf
@@ -17,7 +17,7 @@ _comp_cmd_urlsnarf()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
+        _comp_compgen_usage
     fi
 
 } &&
diff --git a/completions/uscan b/completions/uscan
index 90a3203d0ff..227ac3f3462 100644
--- a/completions/uscan
+++ b/completions/uscan
@@ -27,7 +27,7 @@ _comp_cmd_uscan()
 
     [[ $was_split ]] && return
 
-    COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+    _comp_compgen_help
 } &&
     complete -F _comp_cmd_uscan uscan
 
diff --git a/completions/useradd b/completions/useradd
index a88019c2591..edcde420a3f 100644
--- a/completions/useradd
+++ b/completions/useradd
@@ -52,7 +52,7 @@ _comp_cmd_useradd()
     [[ $was_split ]] && return
 
     [[ $cur == -* ]] &&
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
 } &&
     complete -F _comp_cmd_useradd useradd
 
diff --git a/completions/userdel b/completions/userdel
index cc08bce8b81..e0e7904a1cc 100644
--- a/completions/userdel
+++ b/completions/userdel
@@ -18,7 +18,7 @@ _comp_cmd_userdel()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         return
     fi
 
diff --git a/completions/usermod b/completions/usermod
index e1a4238b70d..b903850ee5a 100644
--- a/completions/usermod
+++ b/completions/usermod
@@ -53,7 +53,7 @@ _comp_cmd_usermod()
 
     if [[ $cur == -* ]]; then
         # TODO: -U/--unlock, -p/--password, -L/--lock mutually exclusive
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         return
     fi
 
diff --git a/completions/valgrind b/completions/valgrind
index 5c5c224ffcd..eb4bf5c6b16 100644
--- a/completions/valgrind
+++ b/completions/valgrind
@@ -13,7 +13,7 @@ _comp_cmd_valgrind()
         fi
     done
 
-    local word tool
+    local word tool=""
     for word in "${words[@]:1}"; do
         if [[ $word == --tool=?* ]]; then
             tool=$word
@@ -70,7 +70,7 @@ _comp_cmd_valgrind()
             # generic cases parsed from --help output
         --+([-A-Za-z0-9_]))
             # shellcheck disable=SC2086
-            local value=$("$1" --help-debug ${tool-} 2>/dev/null |
+            local value=$("$1" --help-debug $tool 2>/dev/null |
                 command sed \
                     -ne "s|^[[:blank:]]*$prev=\([^[:blank:]]\{1,\}\).*|\1|p")
             case $value in
@@ -101,8 +101,7 @@ _comp_cmd_valgrind()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" "--help ${tool-}")' \
-            -- "$cur"))
+        _comp_compgen_help -- --help ${tool:+"$tool"}
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/vipw b/completions/vipw
index 91361ca2100..bfaa48af7b9 100644
--- a/completions/vipw
+++ b/completions/vipw
@@ -17,9 +17,7 @@ _comp_cmd_vipw()
             ;;
     esac
 
-    COMPREPLY=($(
-        compgen -W '$(_parse_help "$1" || _parse_usage "$1")' -- "$cur"
-    ))
+    _comp_compgen_help || _comp_compgen_usage
 } &&
     complete -F _comp_cmd_vipw vipw vigr
 
diff --git a/completions/vmstat b/completions/vmstat
index 77e424017f2..e6af4e111b6 100644
--- a/completions/vmstat
+++ b/completions/vmstat
@@ -19,9 +19,9 @@ _comp_cmd_vmstat()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} ]] ||
-            COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
+            _comp_compgen_usage
     fi
 } &&
     complete -F _comp_cmd_vmstat vmstat
diff --git a/completions/vpnc b/completions/vpnc
index d615bbc7d6b..98e501c8a47 100644
--- a/completions/vpnc
+++ b/completions/vpnc
@@ -61,7 +61,7 @@ _vpnc()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" --long-help)' -- "$cur"))
+        _comp_compgen_help -- --long-help
     elif _comp_looks_like_path "$cur"; then
         # explicit filename
         _comp_compgen_filedir conf
diff --git a/completions/watch b/completions/watch
index f46fa093bb3..38b019603e8 100644
--- a/completions/watch
+++ b/completions/watch
@@ -47,7 +47,7 @@ _comp_cmd_watch()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/webmitm b/completions/webmitm
index 805d2454df9..c56208eeb69 100644
--- a/completions/webmitm
+++ b/completions/webmitm
@@ -6,7 +6,7 @@ _comp_cmd_webmitm()
     _comp_initialize -- "$@" || return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
+        _comp_compgen_usage
     else
         _known_hosts_real -- "$cur"
     fi
diff --git a/completions/wget b/completions/wget
index a6688ee13f6..5f162273a23 100644
--- a/completions/wget
+++ b/completions/wget
@@ -169,7 +169,7 @@ _comp_cmd_wget()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 
diff --git a/completions/wol b/completions/wol
index 0b93bf8deb3..049912666f8 100644
--- a/completions/wol
+++ b/completions/wol
@@ -33,7 +33,7 @@ _comp_cmd_wol()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
diff --git a/completions/wsimport b/completions/wsimport
index 22050d84d6b..edf6fed5aae 100644
--- a/completions/wsimport
+++ b/completions/wsimport
@@ -35,7 +35,7 @@ _comp_cmd_wsimport()
         _known_hosts_real -- "${cur#-httpproxy:}"
         return
     elif [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+        _comp_compgen_help -- -help
         [[ ${COMPREPLY-} == *: ]] && compopt -o nospace
         _comp_ltrim_colon_completions "$cur"
         return
diff --git a/completions/wvdial b/completions/wvdial
index 64434e21818..7a29f764fe7 100644
--- a/completions/wvdial
+++ b/completions/wvdial
@@ -18,7 +18,7 @@ _comp_cmd_wvdial()
 
     case $cur in
         -*)
-            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+            _comp_compgen_help
             [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
             ;;
         *)
diff --git a/completions/xev b/completions/xev
index 9e6848f48fd..a5fbf8a2723 100644
--- a/completions/xev
+++ b/completions/xev
@@ -25,7 +25,7 @@ _comp_cmd_xev()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         return
     fi
 } &&
diff --git a/completions/xgamma b/completions/xgamma
index a506043bdb1..73bc697fa96 100644
--- a/completions/xgamma
+++ b/completions/xgamma
@@ -49,7 +49,7 @@ _comp_cmd_xgamma()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+        _comp_compgen_help -- -help
         if [[ ${COMPREPLY-} ]]; then
             [[ $COMPREPLY == *= ]] && compopt -o nospace
             return
diff --git a/completions/xmllint b/completions/xmllint
index c3e079473ec..c929dba3d8f 100644
--- a/completions/xmllint
+++ b/completions/xmllint
@@ -41,7 +41,7 @@ _comp_cmd_xmllint()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         COMPREPLY=("${COMPREPLY[@]%:}")
         return
     fi
diff --git a/completions/xmlwf b/completions/xmlwf
index d36c813e41c..ae9a539625c 100644
--- a/completions/xmlwf
+++ b/completions/xmlwf
@@ -21,9 +21,7 @@ _comp_cmd_xmlwf()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(
-            compgen -W '$(_parse_help "$1" || _parse_usage "$1")' -- "$cur"
-        ))
+        _comp_compgen_help || _comp_compgen_usage
         return
     fi
 
diff --git a/completions/xmms b/completions/xmms
index 35ef954a575..533010535c3 100644
--- a/completions/xmms
+++ b/completions/xmms
@@ -20,7 +20,7 @@ _comp_cmd_xmms()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
     else
         _comp_compgen_filedir '@(mp[23]|ogg|wav|pls|m3u|xm|mod|s[3t]m|it|mtm|ult|flac)'
     fi
diff --git a/completions/xmodmap b/completions/xmodmap
index 68492753cce..f8d295744cf 100644
--- a/completions/xmodmap
+++ b/completions/xmodmap
@@ -12,7 +12,7 @@ _comp_cmd_xmodmap()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+        _comp_compgen_help -- -help
         return
     fi
 
diff --git a/completions/xrdb b/completions/xrdb
index 4577cf6d7e6..0bd2598c445 100644
--- a/completions/xrdb
+++ b/completions/xrdb
@@ -16,7 +16,7 @@ _comp_cmd_xrdb()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         return
     fi
 
diff --git a/completions/xsltproc b/completions/xsltproc
index 21622d25bd2..3f06c8e26c5 100644
--- a/completions/xsltproc
+++ b/completions/xsltproc
@@ -37,7 +37,7 @@ _comp_cmd_xsltproc()
     [[ $cword -gt 2 && ${words[cword - 2]} == --?(string)param ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         COMPREPLY=("${COMPREPLY[@]%:}")
     else
         # TODO: 1st file xsl|xslt, 2nd XML
diff --git a/completions/xvfb-run b/completions/xvfb-run
index d4f85768f42..9ae1fc85ce1 100644
--- a/completions/xvfb-run
+++ b/completions/xvfb-run
@@ -30,7 +30,7 @@ _comp_cmd_xvfb_run()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
diff --git a/completions/xxd b/completions/xxd
index e824dd0b564..b9facde1817 100644
--- a/completions/xxd
+++ b/completions/xxd
@@ -13,7 +13,7 @@ _comp_cmd_xxd()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
+        _comp_compgen_help -- -h
         return
     fi
 
diff --git a/completions/xzdec b/completions/xzdec
index a4fad321115..21ee6ec9eaf 100644
--- a/completions/xzdec
+++ b/completions/xzdec
@@ -19,7 +19,7 @@ _comp_cmd_xzdec()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi