--- a/ChangeSet.st	Mon Dec 29 21:36:09 2014 +0100
+++ b/ChangeSet.st	Wed Dec 31 10:06:59 2014 +0100
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libbasic3' }"
 
+"{ NameSpace: Smalltalk }"
+
 OrderedCollection subclass:#ChangeSet
 	instanceVariableNames:'changedClasses changeSelectors name'
 	classVariableNames:''
@@ -3894,11 +3896,12 @@
 fileOutAllDefinitionsOf:nonMetaInfo on:aStream
     "append expressions on aStream, which defines myself and all of my private classes."
 
-    | metaInfo |
-
-    nonMetaInfo definition isPrivateClassDefinitionChange ifFalse:[
-        nonMetaInfo definition package notNil ifTrue:[
-            aStream nextPutAll: ('"{ Package: ''%1'' }"' bindWith: nonMetaInfo definition package).
+    | metaInfo definition metaDefinition |
+
+    definition := nonMetaInfo definition.
+    definition isPrivateClassDefinitionChange ifFalse:[
+        definition package notNil ifTrue:[
+            aStream nextPutAll: ('"{ Package: ''%1'' }"' bindWith: definition package).
             aStream cr; cr.
         ].
         namespaceName notNil ifTrue:[
@@ -3907,23 +3910,24 @@
         ].
     ].
 
-    aStream nextChunkPut: (nonMetaInfo definition definitionStringInNamespace: namespaceName).
+    aStream nextChunkPut: (definition definitionStringInNamespace: namespaceName).
     aStream cr; cr.
 
     "/
     "/ optional classInstanceVariables
     "/
     metaInfo := metaInfos at: nonMetaInfo name.
-    metaInfo definition notNil ifTrue:[
+    metaDefinition := metaInfo definition.
+    metaDefinition notNil ifTrue:[
         | anySuperClassInstVar myClass |
         aStream 
-            nextPutAll: metaInfo definition className; 
+            nextPutAll: metaDefinition className; 
             nextPutAll:' instanceVariableNames:';
-            nextPutAll: (metaInfo definition classInstVarNames asStringWith:' ') storeString.
+            nextPutAll: (metaDefinition classInstVarNames asStringWith:' ') storeString.
         "mhmh - good idea; saw this in SmallDraw sourcecode ..."
 
         anySuperClassInstVar := false.
-        myClass := metaInfo definition changeClass.
+        myClass := metaDefinition changeClass.
         myClass notNil ifTrue:[myClass := myClass theNonMetaclass].
         myClass notNil ifTrue:[
             myClass allSuperclassesDo:[:aSuperClass |
@@ -4167,7 +4171,7 @@
 !
 
 version_SVN
-    ^ '$Id: ChangeSet.st,v 1.252 2014-12-29 20:36:09 cg Exp $'
+    ^ '$Id: ChangeSet.st,v 1.253 2014-12-31 09:06:59 cg Exp $'
 ! !
 
 !ChangeSet::ClassSourceWriter::ClassInfo class methodsFor:'instance creation'!
@@ -4846,11 +4850,11 @@
 !ChangeSet class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.252 2014-12-29 20:36:09 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.253 2014-12-31 09:06:59 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.252 2014-12-29 20:36:09 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.253 2014-12-31 09:06:59 cg Exp $'
 !
 
 version_HG
@@ -4859,6 +4863,6 @@
 !
 
 version_SVN
-    ^ '$Id: ChangeSet.st,v 1.252 2014-12-29 20:36:09 cg Exp $'
+    ^ '$Id: ChangeSet.st,v 1.253 2014-12-31 09:06:59 cg Exp $'
 ! !