Refinements to removal of zsh hack

autocomplete/zsh_autocomplete

@@ -1,16 +1,20 @@
 #compdef $PROG
 
-local -a opts
-local cur
-cur=${words[-1]}
-if [[ "$cur" == "-"* ]]; then
-  opts=("${(@f)$(${words[@]:0:#words[@]-1} ${cur} --generate-bash-completion)}")
-else
-  opts=("${(@f)$(${words[@]:0:#words[@]-1} --generate-bash-completion)}")
-fi
+_cli_zsh_autocomplete() {
+  local -a opts
+  local cur
+  cur=${words[-1]}
+  if [[ "$cur" == "-"* ]]; then
+    opts=("${(@f)$(${words[@]:0:#words[@]-1} ${cur} --generate-bash-completion)}")
+  else
+    opts=("${(@f)$(${words[@]:0:#words[@]-1} --generate-bash-completion)}")
+  fi
 
-if [[ "${opts[1]}" != "" ]]; then
-  _describe 'values' opts
-else
-  _files
-fi
+  if [[ "${opts[1]}" != "" ]]; then
+    _describe 'values' opts
+  else
+    _files
+  fi
+}
+
+compdef _cli_zsh_autocomplete $PROG