diff --git a/jode/jode/flow/ConditionalBlock.java b/jode/jode/flow/ConditionalBlock.java
index b1b7847..c2d2c13 100644
--- a/jode/jode/flow/ConditionalBlock.java
+++ b/jode/jode/flow/ConditionalBlock.java
@@ -122,7 +122,9 @@ public class ConditionalBlock extends InstructionContainer {
     public void dumpInstruction(TabbedPrintWriter writer)
         throws java.io.IOException
     {
-        writer.println("IF ("+instr.toString()+")");
+        writer.print("IF (");
+	instr.dumpExpression(writer);
+	writer.println(")");
         writer.tab();
         trueBlock.dumpSource(writer);
         writer.untab();
diff --git a/jode/jode/flow/IfThenElseBlock.java b/jode/jode/flow/IfThenElseBlock.java
index 835789c..694ba2a 100644
--- a/jode/jode/flow/IfThenElseBlock.java
+++ b/jode/jode/flow/IfThenElseBlock.java
@@ -140,7 +140,9 @@ public class IfThenElseBlock extends StructuredBlock {
         throws java.io.IOException
     {
         boolean needBrace = thenBlock.needsBraces();
-        writer.print("if ("+cond.toString()+")");
+        writer.print("if (");
+	cond.dumpExpression(writer);
+	writer.print(")");
 	if (needBrace)
 	    writer.openBrace();
 	else
diff --git a/jode/jode/flow/ReturnBlock.java b/jode/jode/flow/ReturnBlock.java
index 38e4dd9..0142e8a 100644
--- a/jode/jode/flow/ReturnBlock.java
+++ b/jode/jode/flow/ReturnBlock.java
@@ -74,7 +74,11 @@ public class ReturnBlock extends InstructionContainer {
     public void dumpInstruction(TabbedPrintWriter writer) 
 	throws java.io.IOException
     {
-        writer.println("return" + 
-                       (instr == null ? "" : " " + instr) + ";");
+        writer.print("return");
+	if (instr != null) {
+	    writer.print(" ");
+	    instr.dumpExpression(writer);
+	}
+	writer.println(";");
     }
 }
diff --git a/jode/jode/flow/ThrowBlock.java b/jode/jode/flow/ThrowBlock.java
index 26b52e0..c994278 100644
--- a/jode/jode/flow/ThrowBlock.java
+++ b/jode/jode/flow/ThrowBlock.java
@@ -32,6 +32,8 @@ public class ThrowBlock extends ReturnBlock {
     public void dumpInstruction(TabbedPrintWriter writer) 
 	throws java.io.IOException
     {
-        writer.println("throw " + instr + ";");
+        writer.print("throw ");
+	instr.dumpExpression(writer);
+	writer.println(";");
     }
 }