--- a/VSEFileSourceWriter.st	Fri Feb 13 03:22:54 2015 +0100
+++ b/VSEFileSourceWriter.st	Fri Feb 13 03:34:11 2015 +0100
@@ -462,17 +462,21 @@
     replacer alwaysPerformAllSearches:true.
 
     replacer
-        replace: '[| `@temps | ``@.Statements. ] valueNowOrOnUnwindDo: ``@block'
+        replace:'``@expr subclassesDo: ``@block '
             "->"
-           with: '[| `@temps | ``@.Statements. ] ensure: ``@block';
+           with: ' ``@expr subclasses do: ``@block ';
 
-        replace: '[| `@temps | ``@.Statements. ] valueOnUnwindDo: ``@block'
+        replace: ' [| `@temps | ``@.Statements. ] valueNowOrOnUnwindDo: ``@block'
             "->"
-           with: '[| `@temps | ``@.Statements. ] ifCurtailed: ``@block';
+           with: ' [| `@temps | ``@.Statements. ] ensure: ``@block';
 
-        replace:'``@err handle:``@handler do: ``@expr'
+        replace: ' [| `@temps | ``@.Statements. ] valueOnUnwindDo: ``@block'
             "->"
-           with: '``@expr on: ``@err do: ``@handler'.
+           with: ' [| `@temps | ``@.Statements. ] ifCurtailed: ``@block';
+
+        replace:' ``@err handle: ``@handler do: ``@expr'
+            "->"
+           with: ' ``@expr on: ``@err do: ``@handler'.
 
     tree := RBParser 
         parseMethod:source
@@ -560,10 +564,10 @@
 !VSEFileSourceWriter class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/VSEFileSourceWriter.st,v 1.18 2015-02-13 02:22:54 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/VSEFileSourceWriter.st,v 1.19 2015-02-13 02:34:11 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/VSEFileSourceWriter.st,v 1.18 2015-02-13 02:22:54 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/VSEFileSourceWriter.st,v 1.19 2015-02-13 02:34:11 cg Exp $'
 ! !