--- orig/compiler/ParseTreeSearcher.st
+++ mod/compiler/ParseTreeSearcher.st
@@ -296,10 +296,7 @@
 !RBSmallDictionary class methodsFor: 'instance creation'!
 
 new
-    ^self new: 2!
-
-new: anInteger
-    ^(self basicNew: anInteger) initialize: anInteger! !
+    ^self new: 2! !
 
 
 RBProgramNodeVisitor subclass: #ParseTreeSearcher
@@ -750,7 +747,7 @@
 	    [:key :value | 
 	    (key isString not and: [key recurseInto]) 
 		ifTrue: 
-		    [oldContext at: key put: (value collect: [:each | self visitNode: each])]]! !
+		    [oldContext at: key put: (value collect: [:each | self visitNode: each copy])]]! !
 
 !ParseTreeRewriter methodsFor: 'visiting'!
 
@@ -791,6 +788,7 @@
 			    [Transcript
 				show: 'Cannot replace message node inside of cascaded node with non-message node.';
 				cr.
+			    notFound add: each.
 			    newMessages add: each]]].
     notFound size == aCascadeNode messages size 
 	ifTrue: