--- a/AbstractSettingsApplication.st	Fri Feb 21 13:59:26 2020 +0100
+++ b/AbstractSettingsApplication.st	Fri Feb 21 14:05:35 2020 +0100
@@ -1342,10 +1342,6 @@
 !
 
 buildDirectory
-    buildDirectory isNil ifTrue:[
-        buildDirectory := ValueHolder new.
-        buildDirectory onChangeSend:#updateModifiedChannel to:self
-    ].
     ^ buildDirectory.
 !
 
@@ -1386,19 +1382,12 @@
 !
 
 localBuild
-    localBuild isNil ifTrue:[
-        localBuild := UserPreferences current localBuild asValue.
-        localBuild onChangeSend:#updateModifiedChannel to:self
-    ].
     ^ localBuild.
 !
 
 selectedSettingHolder
     <resource: #uiAspect>
 
-    selectedSettingHolder isNil ifTrue:[
-        selectedSettingHolder := ValueHolder new.
-    ].
     ^ selectedSettingHolder.
 !
 
@@ -1413,10 +1402,6 @@
 !
 
 usedCompilerForBuild
-    usedCompilerForBuild isNil ifTrue:[
-        usedCompilerForBuild := nil asValue.
-        usedCompilerForBuild onChangeSend:#updateModifiedChannel to:self
-    ].
     ^ usedCompilerForBuild.
 
     "Created: / 22-01-2012 / 10:59:30 / cg"
@@ -1430,6 +1415,21 @@
 
 !AbstractSettingsApplication::AllSettingsAppl methodsFor:'initialization'!
 
+initialize
+    super initialize.
+
+    buildDirectory := ValueHolder new.
+    buildDirectory onChangeSend:#updateModifiedChannel to:self.
+
+    localBuild := ValueHolder with:(UserPreferences current localBuild).
+    localBuild onChangeSend:#updateModifiedChannel to:self.
+
+    selectedSettingHolder := ValueHolder new.
+
+    usedCompilerForBuild := ValueHolder new.
+    usedCompilerForBuild onChangeSend:#updateModifiedChannel to:self.
+!
+
 postBuildDirectoryField:aField
     aField historyList value:(Array
         with:(OperatingSystem getHomeDirectory asFilename construct:'stx_build') pathName
@@ -1955,10 +1955,6 @@
 !
 
 buildDirectory
-    buildDirectory isNil ifTrue:[
-        buildDirectory := ValueHolder new.
-        buildDirectory onChangeSend:#updateModifiedChannel to:self
-    ].
     ^ buildDirectory.
 !
 
@@ -1973,18 +1969,10 @@
 !
 
 localBuild
-    localBuild isNil ifTrue:[
-        localBuild := UserPreferences current localBuild asValue.
-        localBuild onChangeSend:#updateModifiedChannel to:self
-    ].
     ^ localBuild.
 !
 
 usedCompilerForBuild
-    usedCompilerForBuild isNil ifTrue:[
-        usedCompilerForBuild := nil asValue.
-        usedCompilerForBuild onChangeSend:#updateModifiedChannel to:self
-    ].
     ^ usedCompilerForBuild.
 
     "Created: / 22-01-2012 / 10:59:30 / cg"
@@ -1998,6 +1986,20 @@
 
 !AbstractSettingsApplication::BuildSettingsAppl methodsFor:'initialization'!
 
+initialize
+    super initialize.
+
+    usedCompilerForBuild := ValueHolder new.
+    usedCompilerForBuild onChangeSend:#updateModifiedChannel to:self.
+
+    localBuild := ValueHolder with:(UserPreferences current localBuild).
+    localBuild onChangeSend:#updateModifiedChannel to:self.
+
+    buildDirectory := ValueHolder new.
+    buildDirectory onChangeSend:#updateModifiedChannel to:self
+
+!
+
 postBuildDirectoryField:aField
     aField historyList value:(Array
         with:(OperatingSystem getHomeDirectory asFilename construct:'stx_build') pathName