--- a/ChangeSet.st	Tue Jan 03 14:37:15 2017 +0100
+++ b/ChangeSet.st	Tue Jan 03 14:40:33 2017 +0100
@@ -790,6 +790,7 @@
     "Created: / 27.10.1997 / 13:52:54 / cg"
 ! !
 
+
 !ChangeSet class methodsFor:'Compatibility-VW'!
 
 component: component definition: anObject change: changeSymbol
@@ -1115,8 +1116,8 @@
     "Allow objects to depend on the ChangeSet class instead of a particular instance
      of ChangeSet (which may be switched using projects)."
 
-    self == ChangeSet current ifTrue:[
-	ChangeSet changed:anAspectSymbol with:aParameter.
+    self == self class current ifTrue:[
+        self class changed:anAspectSymbol with:aParameter.
     ].
     super changed:anAspectSymbol with:aParameter
 ! !
@@ -1762,25 +1763,25 @@
 
     |selected  classes |
 
-    classes := (aCollectionOfClasses collect:[:eachClass | eachClass theNonMetaclass]) asArray.
-
-    selected := ChangeSet new.
+    classes := aCollectionOfClasses collect:[:eachClass | eachClass theNonMetaclass] as:Array.
+
+    selected := self class new.
 
     self do:[:eachChange |
-	|changeClassName changeClass isIn|
-
-	changeClass := eachChange changeClass.
-	(changeClass notNil) ifTrue:[
-	    changeClass := changeClass theNonMetaclass.
-	    ((classes includes:changeClass)
-		or: [
-		    changeClass isPrivate
-		    and: [ (classes includes:changeClass owningClass) ]
-		]
-	    ) ifTrue:[
-		selected add: eachChange
-	    ].
-	]
+        |changeClassName changeClass isIn|
+
+        changeClass := eachChange changeClass.
+        (changeClass notNil) ifTrue:[
+            changeClass := changeClass theNonMetaclass.
+            ((classes includes:changeClass)
+                or: [
+                    changeClass isPrivate
+                    and: [ (classes includes:changeClass owningClass) ]
+                ]
+            ) ifTrue:[
+                selected add: eachChange
+            ].
+        ]
     ].
     ^ selected.
 
@@ -2065,10 +2066,10 @@
                   ]. 
     ].    
 
-    onlyInReceiver := ChangeSet new.
-    onlyInArg      := ChangeSet new.
-    changedMethods := ChangeSet new.
-    same           := ChangeSet new.
+    onlyInReceiver := self class new.
+    onlyInArg      := self class new.
+    changedMethods := self class new.
+    same           := self class new.
 
     indexFromChangedMethodsToA := OrderedCollection new.
     indexFromChangedMethodsToB := OrderedCollection new.