5 files changed, 9 insertions, 6 deletions
diff --git a/Completion/Builtins/_bindkey b/Completion/Builtins/_bindkey
index d1e1f8ab1..cca4f7e64 100644
--- a/Completion/Builtins/_bindkey
+++ b/Completion/Builtins/_bindkey
@@ -7,7 +7,8 @@
 #
 # Where appropriate, will complete keymaps instead of widgets.
 
-local state expl line
+local state expl line curcontext="$curcontext"
+typeset -A opt_args
 
 _arguments -C -s \
   '(-v -a -M -l -D -A -N)-e[select emacs keymap and bind it to main]' \
diff --git a/Completion/Builtins/_compdef b/Completion/Builtins/_compdef
index 649daa6dc..180df920d 100644
--- a/Completion/Builtins/_compdef
+++ b/Completion/Builtins/_compdef
@@ -1,6 +1,7 @@
 #compdef compdef
 
-local state line expl list disp
+local state line expl list disp curcontext="$curcontext"
+typeset -A opt_args
 
 _arguments -C -s \
   '(-d)-a[make function autoloadable]' \
diff --git a/Completion/Builtins/_zcompile b/Completion/Builtins/_zcompile
index af2b2553e..b4428e019 100644
--- a/Completion/Builtins/_zcompile
+++ b/Completion/Builtins/_zcompile
@@ -1,9 +1,9 @@
 #compdef zcompile
 
-local context state line expl
+local state line expl curcontext="$curcontext"
 typeset -A opt_args
 
-_arguments -s \
+_arguments -C -s \
     '(-t -c -m -a)-U[don'\''t expand aliases]' \
     '(-t -M)-R[mark as read]' \
     '(-t -R)-M[mark as mapped]' \
diff --git a/Completion/Builtins/_zpty b/Completion/Builtins/_zpty
index e766e509e..f3e271342 100644
--- a/Completion/Builtins/_zpty
+++ b/Completion/Builtins/_zpty
@@ -1,6 +1,7 @@
 #compdef zpty
 
-local state line list names expl
+local state line list names expl curcontext="$curcontext"
+typeset -A opt_args
 
 _arguments -C -s \
   '(-d -w -r -L)-e[echo input characters]' \
diff --git a/Completion/Builtins/_zstyle b/Completion/Builtins/_zstyle
index 1edd0987f..b2bd1d5a8 100644
--- a/Completion/Builtins/_zstyle
+++ b/Completion/Builtins/_zstyle
@@ -92,7 +92,7 @@ parameters path-directories paths pods ports prefixes processes ps regex
 sequences sessions signals strings tags targets types urls users values
 warnings widgets windows zsh-options)
 
-_arguments ':context:->contexts' ':style:->styles' '*:argument:->style-arg'
+_arguments -C ':context:->contexts' ':style:->styles' '*:argument:->style-arg'
 
 while [[ -n $state ]]; do
   ostate=$state