diff --git a/bash_completion b/bash_completion
index 0ea86e889fd..0ec10c8b64c 100644
--- a/bash_completion
+++ b/bash_completion
@@ -838,7 +838,7 @@ _comp__get_cword_at_cursor()
     fi
 
     local IFS=$' \t\n'
-    local "$2" "$3" "$4" && _comp_upvars -a${#words[@]} "$2" ${words[@]+"${words[@]}"} \
+    local "$2" "$3" "$4" && _comp_upvars -a"${#words[@]}" "$2" ${words[@]+"${words[@]}"} \
         -v "$3" "$cword" -v "$4" "${cur:0:index}"
 }
 
diff --git a/completions/cvs b/completions/cvs
index a3a7585846d..9eb434ad22c 100644
--- a/completions/cvs
+++ b/completions/cvs
@@ -43,7 +43,7 @@ _comp_xfunc_cvs_compgen_roots()
     local -a cvsroots=()
     [[ -v CVSROOT ]] && cvsroots=("$CVSROOT")
     [[ -r ~/.cvspass ]] && cvsroots+=($(awk '{ print $2 }' ~/.cvspass))
-    [[ -r CVS/Root ]] && mapfile -tO ${#cvsroots[@]} cvsroots <CVS/Root
+    [[ -r CVS/Root ]] && mapfile -tO "${#cvsroots[@]}" cvsroots <CVS/Root
     ((${#cvsroots[@]})) &&
         _comp_compgen -- -W '"${cvsroots[@]}"'
     _comp_ltrim_colon_completions "$cur"