--- a/MenuEditor.st	Mon Jul 28 12:48:17 1997 +0200
+++ b/MenuEditor.st	Mon Jul 28 12:49:46 1997 +0200
@@ -1269,18 +1269,21 @@
 accept
     "automatically generated by UIPainter ..."
 
-    |node cont|
-
-    node := self painter selectedNode.
+    |painter node cont|
+
+    painter := self painter.
+    node := painter selectedNode.
 
     node notNil ifTrue:[
         self isHelpToolSelected ifTrue:[
             self activeHelpTool accept
         ].
         cont := node contents buildFromAspects:aspects.
-        self painter selectedNodeChanged
+        painter selectedNodeChanged
     ].
     self modifiedChannel value:false.
+
+    "Modified: 28.7.1997 / 12:37:17 / cg"
 !
 
 cancel
@@ -1332,62 +1335,39 @@
 !
 
 enabledStepIn
-    |holder|
-
-    (holder := builder bindingAt:#enabledStepIn) isNil ifTrue:[
-        builder aspectAt:#enabledStepIn put:(holder :=  false asValue).
-    ].
-    ^ holder
-
+    ^ builder booleanAspectFor:#enabledStepIn
+
+    "Modified: 28.7.1997 / 12:47:35 / cg"
 !
 
 enabledStepOut
-    |holder|
-
-    (holder := builder bindingAt:#enabledStepOut) isNil ifTrue:[
-        builder aspectAt:#enabledStepOut put:(holder :=  false asValue).
-    ].
-    ^ holder
-
+    ^ builder booleanAspectFor:#enabledStepOut
+
+    "Modified: 28.7.1997 / 12:47:38 / cg"
 !
 
 enabledStepOver
-    |holder|
-
-    (holder := builder bindingAt:#enabledStepOver) isNil ifTrue:[
-        builder aspectAt:#enabledStepOver put:(holder :=  false asValue).
-    ].
-    ^ holder
+    ^ builder booleanAspectFor:#enabledStepOver
+
+    "Modified: 28.7.1997 / 12:47:40 / cg"
 !
 
 hasAnySingleSelection
-    |holder|
-
-    (holder := builder bindingAt:#hasAnySingleSelection) isNil ifTrue:[
-        builder aspectAt:#hasAnySingleSelection put:(holder :=  false asValue).
-    ].
-    ^ holder
-
+    ^ builder booleanAspectFor:#hasAnySingleSelection
+
+    "Modified: 28.7.1997 / 12:47:17 / cg"
 !
 
 hasValidSelection
-    |holder|
-
-    (holder := builder bindingAt:#hasValidSelection) isNil ifTrue:[
-        builder aspectAt:#hasValidSelection put:(holder :=  false asValue).
-    ].
-    ^ holder
-
+    ^ builder booleanAspectFor:#hasValidSelection
+
+    "Modified: 28.7.1997 / 12:47:20 / cg"
 !
 
 hasValidSingleSelection
-    |holder|
-
-    (holder := builder bindingAt:#hasValidSingleSelection) isNil ifTrue:[
-        builder aspectAt:#hasValidSingleSelection put:(holder :=  false asValue).
-    ].
-    ^ holder
-
+    ^ builder booleanAspectFor:#hasValidSingleSelection
+
+    "Modified: 28.7.1997 / 12:47:22 / cg"
 !
 
 menuPullDown
@@ -1404,12 +1384,9 @@
 modifiedChannel
     "automatically generated by UIPainter ..."
 
-    |holder|
-
-    (holder := builder bindingAt:#modifiedChannel) isNil ifTrue:[
-        builder aspectAt:#modifiedChannel put:(holder :=  false asValue).
-    ].
-    ^ holder
+    ^ builder booleanAspectFor:#modifiedChannel
+
+    "Modified: 28.7.1997 / 12:47:26 / cg"
 !
 
 tabCanvas