--- a/MessageTally.st	Mon Feb 25 20:58:35 2002 +0100
+++ b/MessageTally.st	Tue Feb 26 14:02:59 2002 +0100
@@ -178,7 +178,7 @@
         ] valueOnUnwindDo:[
             outStream nextPutLine:'TALLY: block returned'.
         ]
-    ] valueNowOrOnUnwindDo:[
+    ] ensure:[
         aTally printLeafStatisticOn:outStream
     ].
 
@@ -198,7 +198,7 @@
         ] valueOnUnwindDo:[
             outStream nextPutLine:'TALLY: block returned'.
         ]
-    ] valueNowOrOnUnwindDo:[
+    ] ensure:[
         aTally printFullStatisticOn:outStream
     ].
 
@@ -617,7 +617,7 @@
         [
             startTime := OperatingSystem getMillisecondTime.
             self execute.
-        ] valueNowOrOnUnwindDo:[
+        ] ensure:[
             probing := executing := false.
             theBlock := nil.
             endTime := OperatingSystem getMillisecondTime.
@@ -669,7 +669,7 @@
         [
             startTime := OperatingSystem getMillisecondTime.
             self execute.
-        ] valueNowOrOnUnwindDo:[
+        ] ensure:[
             probing := executing := false.
             theBlock := nil.
             endTime := OperatingSystem getMillisecondTime.
@@ -683,5 +683,5 @@
 !MessageTally class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/MessageTally.st,v 1.39 2000-08-31 10:02:57 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/MessageTally.st,v 1.40 2002-02-26 13:02:59 cg Exp $'
 ! !

--- a/MessageTracer.st	Mon Feb 25 20:58:35 2002 +0100
+++ b/MessageTracer.st	Tue Feb 26 14:02:59 2002 +0100
@@ -356,7 +356,7 @@
                             skipIfSame:false
                                 silent:true.
         ]
-    ] valueNowOrOnUnwindDo:[
+    ] ensure:[
         Compiler stcCompilation:save
     ].
 
@@ -499,9 +499,7 @@
      The trace output is a low level trace generated in the VM."
 
     ObjectMemory sendTraceOn.
-    ^ aBlock valueNowOrOnUnwindDo:[
-        ObjectMemory sendTraceOff.
-    ]
+    ^ aBlock ensure:[ObjectMemory sendTraceOff]
 
     "
      MessageTracer debugTrace:[#(6 5 4 3 2 1) sort]
@@ -1625,7 +1623,7 @@
                             skipIfSame:false
                                 silent:false. "/ true.
         ]
-    ] valueNowOrOnUnwindDo:[
+    ] ensure:[
         Compiler stcCompilation:save.
         Compiler allowUnderscoreInIdentifier:save2.
     ].
@@ -2541,7 +2539,7 @@
                             skipIfSame:false
                                 silent:true.
         ]
-    ] valueNowOrOnUnwindDo:[
+    ] ensure:[
         Compiler stcCompilation:save
     ].
 
@@ -3019,7 +3017,7 @@
         StepInterruptPending := 1.
         InterruptPending := 1.
         aBlock value
-    ] valueNowOrOnUnwindDo:[
+    ] ensure:[
         tracedBlock := nil.
         StepInterruptPending := nil.
         ObjectMemory stepInterruptHandler:nil.
@@ -3034,7 +3032,6 @@
 
      PrintingMessageTracer new trace:[#(6 5 4 3 2 1) sort] detail:#fullIndent 
     "
-
 ! !
 
 !MessageTracer::InteractionCollector methodsFor:'trace helpers'!
@@ -3126,6 +3123,6 @@
 !MessageTracer class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/MessageTracer.st,v 1.96 2001-10-18 16:51:15 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/MessageTracer.st,v 1.97 2002-02-26 13:02:51 cg Exp $'
 ! !
 MessageTracer initialize!