diff --git a/src/NECompletion/CompletionContext.class.st b/src/NECompletion/CompletionContext.class.st
index 7588cd8d865..c2a99074a00 100644
--- a/src/NECompletion/CompletionContext.class.st
+++ b/src/NECompletion/CompletionContext.class.st
@@ -136,12 +136,12 @@ CompletionContext >> node [
 
 { #category : #parsing }
 CompletionContext >> parseSource [
-	ast := Smalltalk compiler
+	ast := class compiler
 		source: source;
 		noPattern: isWorkspace;
-		options:  #(+ optionParseErrors + optionSkipSemanticWarnings);
+		options: #(+ optionParseErrors + optionSkipSemanticWarnings);
 		parse.
-	ast doSemanticAnalysisIn: class.
+	ast doSemanticAnalysis.
 	TypingVisitor new visitNode: ast
 ]
 
diff --git a/src/OpalCompiler-Core/UndefinedObject.extension.st b/src/OpalCompiler-Core/UndefinedObject.extension.st
index 65d28bfc6f5..dc638de8f22 100644
--- a/src/OpalCompiler-Core/UndefinedObject.extension.st
+++ b/src/OpalCompiler-Core/UndefinedObject.extension.st
@@ -4,3 +4,9 @@ Extension { #name : #UndefinedObject }
 UndefinedObject >> allTempNames [
 	^#()
 ]
+
+{ #category : #'*OpalCompiler-Core' }
+UndefinedObject >> compiler [
+	"nil is used as a class for when compiling expressions (for exampke DoIts)"
+	^Smalltalk compiler
+]
diff --git a/src/Shout/SHRBTextStyler.class.st b/src/Shout/SHRBTextStyler.class.st
index 2e21f1523cf..02fafc91528 100644
--- a/src/Shout/SHRBTextStyler.class.st
+++ b/src/Shout/SHRBTextStyler.class.st
@@ -971,13 +971,13 @@ SHRBTextStyler >> pixelHeight [
 { #category : #private }
 SHRBTextStyler >> privateStyle: aText [
 	| ast |
-	ast := Smalltalk compiler
+	ast := classOrMetaClass compiler
 		source: aText;
 		noPattern: self isForWorkspace ;
 		options:  #(+ optionParseErrors + optionSkipSemanticWarnings);
 		requestor: workspace;
 		parse.				
-	ast doSemanticAnalysisIn: classOrMetaClass.
+	ast doSemanticAnalysis.
 	^ self style: aText ast: ast
 ]