--- a/Block.st	Mon Jun 03 07:56:32 2013 +0000
+++ b/Block.st	Mon May 13 21:21:34 2013 +0200
@@ -2484,11 +2484,10 @@
     "the receiver must be a block of one argument.  It is evaluated, and is passed a block,
      which, if sent a value-message, will restart the receiver block from the beginning"
 
-    |myContext restartAction|
+    |myContext|
 
     myContext := thisContext.
-    restartAction := [ myContext unwindAndRestart ].
-    ^ self value:restartAction.
+    ^ self value:[ myContext restart ].
 
     "
      [:restart |
@@ -2505,11 +2504,10 @@
     "the receiver must be a block of two arguments, a restart and an exit block.
      See description of valueWithExit and valueWithRestart for their use"
 
-    |myContext restartAction|
+    |myContext|
 
     myContext := thisContext.
-    restartAction := [ myContext unwindAndRestart ].
-    ^ self value:restartAction value:[:exitValue | ^exitValue].
+    ^ self value:[myContext restart] value:[:exitValue | ^exitValue].
 
     "
      [:restart :exit |
@@ -3120,11 +3118,11 @@
 !Block class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Block.st,v 1.198 2013-05-24 18:13:53 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Block.st,v 1.196 2013-05-13 19:21:34 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/Block.st,v 1.198 2013-05-24 18:13:53 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Block.st,v 1.196 2013-05-13 19:21:34 stefan Exp $'
 ! !