--- a/DoWhatIMeanSupport.st	Fri Feb 10 11:22:12 2017 +0100
+++ b/DoWhatIMeanSupport.st	Fri Feb 10 19:36:38 2017 +0100
@@ -1885,7 +1885,7 @@
             symbolSelectorClass withAllSuperclassesDo:[:cls |
                 cls ~~ Object ifTrue:[
                     cls ~~ Model ifTrue:[
-                        cls methodDictionary keysDo:addSymbol.
+                        cls selectorsDo:addSymbol.
                     ]
                 ]
             ]
@@ -1955,7 +1955,7 @@
     actionBlock value:possibleCompletions value:editAction value:'symbol'.
 
     "Modified: / 16-02-2010 / 10:15:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified (format): / 03-07-2011 / 15:58:45 / cg"
+    "Modified: / 10-02-2017 / 10:32:54 / cg"
 !
 
 codeCompletionForMessage:node into:actionBlock
@@ -2959,7 +2959,7 @@
             "/ and also messages implemented by superclasses (except Object)
             classOrNil allSuperclassesDo:[:eachSuperclass |
                 eachSuperclass ~~ Object ifTrue:[
-                    eachSuperclass methodDictionary keysDo:[:sel |
+                    eachSuperclass selectorsDo:[:sel |
                         (sel startsWith:selectorTypedSoFar) ifTrue:[
                             addIfNotYetImplemented value:selectorsImplementedInSuper value:sel.
                         ]                     
@@ -3128,7 +3128,7 @@
     "Modified: / 04-07-2006 / 18:48:26 / fm"
     "Created: / 10-11-2006 / 13:46:44 / cg"
     "Modified: / 16-02-2010 / 10:13:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 01-06-2012 / 20:31:36 / cg"
+    "Modified: / 10-02-2017 / 10:32:45 / cg"
 !
 
 codeCompletionForTempVariable:node into:actionBlock
@@ -4578,7 +4578,7 @@
                         SourceCodeManagerError handle:[:ex |
                         ] do:[    
                             tree := implementorOfSelectorUpToCursor parseTree. 
-                            tree notNil ifTrue:[
+                            (tree notNil and:[tree argumentNames size >= argIdx]) ifTrue:[
                                 argName := tree argumentNames at:argIdx.
                                 (argName includesString:'block' caseSensitive:false) ifTrue:[
                                     actionBlock value:{'[ "',argName,'" ]'}
@@ -5877,7 +5877,7 @@
                     setOfTypes add:Metaclass.
                     ^ setOfTypes            
                 ].
-                setOfTypes add:(receiverClass perform:msgSelector) class.
+                setOfTypes add:(receiverClass perform:msgSelector asSymbol) class.
                 ^ setOfTypes            
             ].
             
@@ -5969,7 +5969,7 @@
     
     ^ setOfTypes
 
-    "Modified: / 05-02-2017 / 01:27:47 / cg"
+    "Modified: / 10-02-2017 / 10:39:41 / cg"
 !
 
 classOfNode:aNode