5 files changed, 13 insertions, 13 deletions
diff --git a/Completion/Zsh/Command/_compdef b/Completion/Zsh/Command/_compdef
index 469b135c4..aad1358b9 100644
--- a/Completion/Zsh/Command/_compdef
+++ b/Completion/Zsh/Command/_compdef
@@ -36,7 +36,7 @@ _arguments -C -s -S \
 
 if [[ $state = multi ]]; then
   case $(( CURRENT % 3 )) in
-  0) _message key
+  0) _message -e keys key
      return 1;;
   1) state=cfun;;
   2) state=style;;
diff --git a/Completion/Zsh/Command/_limit b/Completion/Zsh/Command/_limit
index ba384f980..852c55c1c 100644
--- a/Completion/Zsh/Command/_limit
+++ b/Completion/Zsh/Command/_limit
@@ -5,5 +5,5 @@ if ! ((CURRENT % 2)); then
 elif [[ $PREFIX = u* ]]; then
     compadd unlimited
 else
-    _message "number and scaling factor"
+    _message -e values "number and scaling factor"
 fi
diff --git a/Completion/Zsh/Command/_sched b/Completion/Zsh/Command/_sched
index 82b8a7c91..e8ff5ab87 100644
--- a/Completion/Zsh/Command/_sched
+++ b/Completion/Zsh/Command/_sched
@@ -14,7 +14,7 @@ if [[ CURRENT -eq 2 ]]; then
                            compadd "$disp[@]" - {1..$#lines}
     return
   else
-    _message 'time specification'
+    _message -e times 'time specification'
     return 1
   fi
 fi
diff --git a/Completion/Zsh/Command/_zstyle b/Completion/Zsh/Command/_zstyle
index 5abfe824e..99ee8f72b 100644
--- a/Completion/Zsh/Command/_zstyle
+++ b/Completion/Zsh/Command/_zstyle
@@ -197,7 +197,7 @@ while (( $#state )); do
       ;;
 
     argument)
-      _message argument
+      _message -e arguments argument
       ;;
     
     bool) 
@@ -290,9 +290,9 @@ while (( $#state )); do
 
     tag-order)
       if compset -P '*:*:'; then
-        _message description
+        _message -e descriptions description
       elif compset -P '*:'; then
-        _message 'tag alias'
+        _message -e aliases 'tag alias'
       else
         suf=()
         compset -S ':*' || suf=( -qS: )
@@ -302,11 +302,11 @@ while (( $#state )); do
 
     filepat)
       if compset -P '*:*:'; then
-        _message description
+        _message -e descriptions description
       elif compset -P '*:'; then
-        _message tag
+        _message -e tags tag
       else
-        _message 'glob patterns'
+        _message -e patterns 'glob patterns'
       fi
       ;;
 
@@ -341,7 +341,7 @@ while (( $#state )); do
       ;;
 
     fake-files)
-      _message 'prefix and names'
+      _message -e fakes 'prefix and names'
       ;;
 
     fake-params)
@@ -375,11 +375,11 @@ while (( $#state )); do
       ;;
 
     preserve-prefix)
-      _message 'pattern matching prefix to keep'
+      _message -e prefixes 'pattern matching prefix to keep'
       ;;
 
     separator)
-      _message 'separator string'
+      _message -e separators 'separator string'
       ;;
 
     urgh) 
diff --git a/Completion/Zsh/Context/_subscript b/Completion/Zsh/Context/_subscript
index 052848ffe..84510d263 100644
--- a/Completion/Zsh/Context/_subscript
+++ b/Completion/Zsh/Context/_subscript
@@ -22,7 +22,7 @@ elif compset -P '\('; then
     local f=$match[1] d=$match[2] e=$match[2] v=$match[3]
     [[ $f = s && ${(Pt)${compstate[parameter]}} != scalar* ]] && return 1
     if [[ -z $d ]]; then
-      _message 'delimiter'
+      _message -e delimiters 'delimiter'
       return
     else
       case $d in