--- a/DoWhatIMeanSupport.st	Fri Sep 25 07:00:03 2015 +0200
+++ b/DoWhatIMeanSupport.st	Fri Sep 25 07:41:07 2015 +0100
@@ -1172,7 +1172,7 @@
                 language := method programmingLanguage
             ] ifFalse:[
                 contextOrNilArg isJavaContext ifTrue:[
-                    language := JavaLanguage instance
+                    language := (Smalltalk at:#JavaLanguage) instance
                 ] ifFalse:[
                     language := SmalltalkLanguage instance.
                 ].
@@ -1201,7 +1201,7 @@
     self breakPoint: #cg.
 
     "Created: / 27-09-2013 / 10:21:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 08-09-2015 / 21:49:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 25-09-2015 / 07:36:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 codeCompletionForLanguage: languageOrNil class: classOrNilArg context:contextOrNilArg codeView:codeViewArg
@@ -1263,21 +1263,21 @@
      or nil, if called from the browser.
      If nonNil, we can make better guesses, because we actually know what a variable's type is"
 
-    languageOrNil := STXJavaScriptLanguage instance.
+    languageOrNil := (Smalltalk at:#STXJavaScriptLanguage) instance.
     methodOrNil := methodOrNilArg.
     classOrNil := classOrNilArg.
     codeView := codeViewArg.
     contextOrNil := contextOrNilArg.
 
-    JavaScriptCompletionEngine notNil ifTrue:[
-        JavaScriptCompletionEngine new
+    (Smalltalk at:#STXJavaScriptLanguage) notNil ifTrue:[
+        (Smalltalk at:#STXJavaScriptLanguage) new
            completeForMethod: methodOrNil class: classOrNil context: contextOrNil codeView: codeView into: actionBlock.
     ].
 
     self information:'Not yet supported'.
 
     "Created: / 18-09-2013 / 16:24:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 25-09-2013 / 15:13:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 25-09-2015 / 07:37:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !DoWhatIMeanSupport methodsFor:'code completion - Smalltalk'!
@@ -4126,7 +4126,9 @@
                         rbTypes size > 1 ifTrue:[
                             rbTypes remove:ProtoObject ifAbsent:[].
                             rbTypes remove:Autoload ifAbsent:[].
-                            rbTypes remove:ObsoleteObject ifAbsent:[].
+                            (Smalltalk includesKey:#ObsoleteObject) ifTrue:[
+                                rbTypes remove:(Smalltalk at:#ObsoleteObject) ifAbsent:[].
+                            ]
                         ].
                         rbTypes size == 1 ifTrue:[
                             rbType := rbTypes first.
@@ -4433,8 +4435,8 @@
     ].
 
     "Created: / 10-11-2006 / 13:18:27 / cg"
-    "Modified: / 16-02-2010 / 10:33:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 28-08-2013 / 15:27:32 / cg"
+    "Modified: / 25-09-2015 / 07:39:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 codeCompletionForVariable:node inClass:classOrNil codeView:codeView