diff --git a/prism/src/parser/visitor/ExpandLabels.java b/prism/src/parser/visitor/ExpandLabels.java
index d6bc6d86..11890e9d 100644
--- a/prism/src/parser/visitor/ExpandLabels.java
+++ b/prism/src/parser/visitor/ExpandLabels.java
@@ -58,7 +58,7 @@ public class ExpandLabels extends ASTTraverseModify
 			// But also recursively expand that
 			// (nested labels not currently supported but may be one day)
 			// (don't clone it to avoid duplication of work)
-			expr = (Expression)expr.expandLabels(labelList);
+			expr = (Expression) expr.accept(this);
 			// Put in brackets so precedence is preserved
 			// (for display purposes only; in case of re-parse)
 			// Also, preserve type (this is probably being done before
diff --git a/prism/src/parser/visitor/ExpandPropRefsAndLabels.java b/prism/src/parser/visitor/ExpandPropRefsAndLabels.java
index 27641674..4727a774 100644
--- a/prism/src/parser/visitor/ExpandPropRefsAndLabels.java
+++ b/prism/src/parser/visitor/ExpandPropRefsAndLabels.java
@@ -62,7 +62,7 @@ public class ExpandPropRefsAndLabels extends ASTTraverseModify
 			// But also recursively expand that
 			// (nested labels not currently supported but may be one day)
 			// (don't clone it to avoid duplication of work)
-			expr = (Expression)expr.expandLabels(labelList);
+			expr = (Expression) expr.accept(this);
 			// Put in brackets so precedence is preserved
 			// (for display purposes only; in case of re-parse)
 			// Also, preserve type (this is probably being done before
@@ -91,7 +91,7 @@ public class ExpandPropRefsAndLabels extends ASTTraverseModify
 			expr = prop.getExpression().deepCopy();
 			// But also recursively expand that
 			// (don't clone it to avoid duplication of work)
-			expr = (Expression)expr.expandPropRefsAndLabels(propertiesFile, labelList);
+			expr = (Expression) expr.accept(this);
 			// Put in brackets so precedence is preserved
 			// (for display purposes only; in case of re-parse)
 			// Also, preserve type (this is probably being done before