--- a/ProjectDefinition.st	Sat Mar 30 19:35:32 2013 +0100
+++ b/ProjectDefinition.st	Sat Mar 30 20:03:50 2013 +0100
@@ -12,11 +12,11 @@
 "{ Package: 'stx:libbasic' }"
 
 Object subclass:#ProjectDefinition
-	instanceVariableNames:''
-	classVariableNames:'LibraryType GUIApplicationType NonGUIApplicationType
-		PackagesBeingLoaded Verbose AbbrevDictionary AccessLock'
-	poolDictionaries:''
-	category:'System-Support-Projects'
+        instanceVariableNames:''
+        classVariableNames:'LibraryType GUIApplicationType NonGUIApplicationType
+                PackagesBeingLoaded Verbose AbbrevDictionary AccessLock'
+        poolDictionaries:''
+        category:'System-Support-Projects'
 !
 
 ProjectDefinition class instanceVariableNames:'safeForOverwrittenMethods extensionOverwriteInfo projectIsLoaded'
@@ -27,10 +27,10 @@
 !
 
 Object subclass:#AbbrevEntry
-	instanceVariableNames:'className fileName category numClassInstVars'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:ProjectDefinition
+        instanceVariableNames:'className fileName category numClassInstVars'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:ProjectDefinition
 !
 
 !ProjectDefinition class methodsFor:'documentation'!
@@ -845,10 +845,7 @@
 
     newCode := self classNamesAndAttributes_codeFor:newSpec.
 
-    (compilerOrNil ? self compilerClass)
-        compile:newCode
-        forClass:self theMetaclass
-        inCategory:'description - contents'.
+    self compile:newCode categorized:'description - contents' using:compilerOrNil
 !
 
 excludeClasses:toExclude usingCompiler:compilerOrNil
@@ -906,10 +903,7 @@
     ].
 
     newCode := self extensionMethodNames_code_For:newSpec.
-    (compilerOrNil ? self compilerClass)
-        compile:newCode
-        forClass:self theMetaclass
-        inCategory:'description - contents'.
+    self compile:newCode categorized:'description - contents' using:compilerOrNil
 !
 
 includeClasses:toInclude usingCompiler:compilerOrNil
@@ -968,11 +962,7 @@
     ].
 
     newCode := self extensionMethodNames_code_For:newSpec.
-
-    (compilerOrNil ? self compilerClass)
-        compile:newCode
-        forClass:self theMetaclass
-        inCategory:'description - contents'.
+    self compile:newCode categorized:'description - contents' using:compilerOrNil
 !
 
 makeClassesAutoloaded:toMakeAutoloaded usingCompiler:compilerOrNil
@@ -1019,11 +1009,7 @@
     |newCode|
 
     newCode := self extensionMethodNames_code.
-
-    (compilerOrNil ? self compilerClass)
-        compile:newCode
-        forClass:self theMetaclass
-        inCategory:'description - contents'.
+    self compile:newCode categorized:'description - contents' using:compilerOrNil
 ! !
 
 !ProjectDefinition class methodsFor:'accessing - tests'!
@@ -5131,10 +5117,14 @@
 !
 
 compile:someCode categorized:category
-    Class packageQuerySignal
+    ^ self compile:someCode categorized:category using:nil
+!
+
+compile:someCode categorized:category using:compilerOrNil
+    ^ Class packageQuerySignal
         answer:self package
         do:[
-            self theMetaclass compilerClass
+            (compilerOrNil ? self theMetaclass compilerClass)
                 compile:someCode
                 forClass:self theMetaclass
                 inCategory:category
@@ -7261,11 +7251,11 @@
 !ProjectDefinition class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.446 2013-03-30 18:35:32 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.447 2013-03-30 19:03:50 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.446 2013-03-30 18:35:32 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.447 2013-03-30 19:03:50 cg Exp $'
 !
 
 version_SVN