--- a/ChangesBrowser.st	Wed Jul 26 12:35:13 2017 +0200
+++ b/ChangesBrowser.st	Wed Jul 26 17:09:46 2017 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1990 by Claus Gittinger
 	      All Rights Reserved
@@ -2146,7 +2148,7 @@
     self withSelectedChangesDo:[:changeNr |
         | classNameToCompress selector |
 
-        classNameToCompress := self classNameOfChange:changeNr.
+        classNameToCompress := self realClassNameOfChange:changeNr.
         classNameToCompress notNil ifTrue:[
             selector := self selectorOfMethodChange:changeNr.
             selector notNil ifTrue:[
@@ -2156,7 +2158,7 @@
     ].
 
     classSelectorPairs do:[:pair |
-        self compressForClass:pair key selector:pair value.
+        self compressForClass:(pair key) selector:(pair value).
     ]
 
     "Created: / 19.11.2001 / 21:50:59 / cg"
@@ -2415,37 +2417,37 @@
     lastChangeNr := -1.
     classNameSelectorPairsToDelete := Set new.
     self withSelectedChangesDo:[:changeNr |
-	|className selector|
-
-	className := self classNameOfChange:changeNr.
-	selector := self selectorOfMethodChange:changeNr.
-	selector notNil ifTrue:[
-	    (className notNil and:[selector notNil]) ifTrue:[
-		classNameSelectorPairsToDelete add:(className -> selector).
-	    ]
-	].
-	lastChangeNr := lastChangeNr max:changeNr.
+        |className selector|
+
+        className := self realClassNameOfChange:changeNr.
+        selector := self selectorOfMethodChange:changeNr.
+        selector notNil ifTrue:[
+            (className notNil and:[selector notNil]) ifTrue:[
+                classNameSelectorPairsToDelete add:(className -> selector).
+            ]
+        ].
+        lastChangeNr := lastChangeNr max:changeNr.
     ].
 
     overAllNumDeletedBefore := 0.
     changeListView setSelection:nil.
 
     self withExecuteCursorDo:[
-	classNameSelectorPairsToDelete do:[:pair |
-	    |numDeletedBefore className selector|
-
-	    className := pair key.
-	    selector  := pair value.
-	    self silentDeleteChangesFor:className selector:selector
-				   from:lastChangeNr
-				     to:(self numberOfChanges).
-	    numDeletedBefore := self
-				   silentDeleteChangesFor:className selector:selector
-				   from:1
-				   to:(lastChangeNr-1).
-	    lastChangeNr := lastChangeNr - numDeletedBefore.
-	    overAllNumDeletedBefore := overAllNumDeletedBefore + numDeletedBefore.
-	].
+        classNameSelectorPairsToDelete do:[:pair |
+            |numDeletedBefore className selector|
+
+            className := pair key.
+            selector  := pair value.
+            self silentDeleteChangesFor:className selector:selector
+                                   from:lastChangeNr
+                                     to:(self numberOfChanges).
+            numDeletedBefore := self
+                                   silentDeleteChangesFor:className selector:selector
+                                   from:1
+                                   to:(lastChangeNr-1).
+            lastChangeNr := lastChangeNr - numDeletedBefore.
+            overAllNumDeletedBefore := overAllNumDeletedBefore + numDeletedBefore.
+        ].
     ].
 
     self setChangeList.
@@ -2468,7 +2470,7 @@
     self withSelectedChangesDo:[:changeNr |
         |className selector|
 
-        className := self classNameOfChange:changeNr.
+        className := self realClassNameOfChange:changeNr.
         selector := self selectorOfMethodChange:changeNr.
         selector notNil ifTrue:[
             (className notNil and:[selector notNil]) ifTrue:[
@@ -3644,7 +3646,7 @@
     "/ does not care for VW qualified names
     "/ ^ Parser parseExpression:text inNameSpace:nameSpace.
 
-(text includesString:'§') ifTrue:[self halt].
+(text includesString:'§') ifTrue:[self halt].
 
     "/ new:
     parser := Parser for:(ReadStream on:text).
@@ -5615,14 +5617,14 @@
     numDeleted := 0.
     index := stop.
     [index >= start] whileTrue:[
-	thisClassName := self classNameOfChange:index.
-	thisClassName = aClassName ifTrue:[
-	    (self selectorOfMethodChange:index) == selector ifTrue:[
-		self silentDeleteChange:index.
-		numDeleted := numDeleted + 1.
-	    ]
-	].
-	index := index - 1
+        thisClassName := self realClassNameOfChange:index.
+        thisClassName = aClassName ifTrue:[
+            (self selectorOfMethodChange:index) == selector ifTrue:[
+                self silentDeleteChange:index.
+                numDeleted := numDeleted + 1.
+            ]
+        ].
+        index := index - 1
     ].
     ^ numDeleted
 !
@@ -6667,7 +6669,7 @@
     "
     clsName := nil.
 
-(chunkText includesString:'§') ifTrue:[self halt].
+(chunkText includesString:'§') ifTrue:[self halt].
 
     p := browser parseExpression:chunkText inNameSpace:(self nameSpaceForApply).
     (p notNil and:[p ~~ #Error and:[p isMessage]]) ifTrue:[