diff --git a/src/NECompletion/CompletionContext.class.st b/src/NECompletion/CompletionContext.class.st
index 90aaab3b516..324026f577d 100644
--- a/src/NECompletion/CompletionContext.class.st
+++ b/src/NECompletion/CompletionContext.class.st
@@ -56,10 +56,9 @@ CompletionContext >> narrowWith: aString [
 
 { #category : #parsing }
 CompletionContext >> parseSource [
-	 ast := Smalltalk compiler
+	 ast := class compiler
 				source: source;
 				options: #(+ optionParseErrors + optionSkipSemanticWarnings);
-				class: class;
 				noPattern: isWorkspace;
 				parse.
 	ast doSemanticAnalysisIn: class.
diff --git a/src/Shout/SHRBTextStyler.class.st b/src/Shout/SHRBTextStyler.class.st
index c75e2bf166c..b155075425b 100644
--- a/src/Shout/SHRBTextStyler.class.st
+++ b/src/Shout/SHRBTextStyler.class.st
@@ -971,10 +971,9 @@ SHRBTextStyler >> pixelHeight [
 { #category : #private }
 SHRBTextStyler >> privateStyle: aText [
 	| ast |
-	ast := Smalltalk compiler
+	ast := classOrMetaClass compiler
 				source: aText;
 				options: #(+ optionParseErrors + optionSkipSemanticWarnings);
-				class: classOrMetaClass;
 				noPattern: self isForWorkspace;
 				requestor: workspace;
 				parse.