2 files changed, 5 insertions, 23 deletions
diff --git a/src/core/src/tonkadur/fate/v1/lang/Macro.java b/src/core/src/tonkadur/fate/v1/lang/Macro.java
index 6030663..fd81db1 100644
--- a/src/core/src/tonkadur/fate/v1/lang/Macro.java
+++ b/src/core/src/tonkadur/fate/v1/lang/Macro.java
@@ -16,7 +16,7 @@ import tonkadur.fate.v1.lang.instruction.Display;
 import tonkadur.fate.v1.lang.instruction.InstructionList;
 
 import tonkadur.fate.v1.lang.valued_node.Cast;
-import tonkadur.fate.v1.lang.valued_node.ValueToText;
+import tonkadur.fate.v1.lang.valued_node.ValueToRichText;
 
 public class Macro extends DeclaredEntity
 {
@@ -104,12 +104,12 @@ public class Macro extends DeclaredEntity
 
       result = ((Display) instr).get_content();
 
-      if (!(result instanceof ValueToText))
+      if (!(result instanceof ValueToRichText))
       {
          return result;
       }
 
-      result = ((ValueToText) result).get_value();
+      result = ((ValueToRichText) result).get_value();
 
       if (!(result instanceof Cast))
       {
diff --git a/src/core/src/tonkadur/wyrd/v1/visitor/fate/v1/FateVisitor.java b/src/core/src/tonkadur/wyrd/v1/visitor/fate/v1/FateVisitor.java
index dfc655c..ecdce81 100644
--- a/src/core/src/tonkadur/wyrd/v1/visitor/fate/v1/FateVisitor.java
+++ b/src/core/src/tonkadur/wyrd/v1/visitor/fate/v1/FateVisitor.java
@@ -275,24 +275,6 @@ public abstract class FateVisitor implements NodeVisitor
       throw new UnhandledASTElementException();
    }
 
-   public void visit_sentence
-   (
-      final tonkadur.fate.v1.lang.valued_node.Sentence n
-   )
-   throws Throwable
-   {
-      throw new UnhandledASTElementException();
-   }
-
-   public void visit_space
-   (
-      final tonkadur.fate.v1.lang.valued_node.Space n
-   )
-   throws Throwable
-   {
-      throw new UnhandledASTElementException();
-   }
-
    public void visit_text_with_effect
    (
       final tonkadur.fate.v1.lang.valued_node.TextWithEffect n
@@ -302,9 +284,9 @@ public abstract class FateVisitor implements NodeVisitor
       throw new UnhandledASTElementException();
    }
 
-   public void visit_value_to_text
+   public void visit_value_to_rich_text
    (
-      final tonkadur.fate.v1.lang.valued_node.ValueToText n
+      final tonkadur.fate.v1.lang.valued_node.ValueToRichText n
    )
    throws Throwable
    {