diff --git a/code/src/java/plugin/lsttokens/ModifyLst.java b/code/src/java/plugin/lsttokens/ModifyLst.java
index caeba8799c3..fa8cf8d2847 100644
--- a/code/src/java/plugin/lsttokens/ModifyLst.java
+++ b/code/src/java/plugin/lsttokens/ModifyLst.java
@@ -36,7 +36,7 @@
 import pcgen.cdom.formula.scope.PCGenScope;
 import pcgen.core.Campaign;
 import pcgen.rules.context.LoadContext;
-import pcgen.rules.persistence.token.AbstractTokenWithSeparator;
+import pcgen.rules.persistence.token.AbstractNonEmptyToken;
 import pcgen.rules.persistence.token.CDOMInterfaceToken;
 import pcgen.rules.persistence.token.CDOMPrimaryToken;
 import pcgen.rules.persistence.token.ParseResult;
@@ -45,7 +45,7 @@
  * The MODIFY token defined by ModifyLst defines a calculation to be performed in the
  * (new) formula system.
  */
-public class ModifyLst extends AbstractTokenWithSeparator<VarHolder>
+public class ModifyLst extends AbstractNonEmptyToken<VarHolder>
 		implements CDOMInterfaceToken<VarContainer, VarHolder>, CDOMPrimaryToken<VarHolder>
 {
 
@@ -56,13 +56,7 @@ public String getTokenName()
 	}
 
 	@Override
-	protected char separator()
-	{
-		return '|';
-	}
-
-	@Override
-	protected ParseResult parseTokenWithSeparator(LoadContext context, VarHolder obj, String value)
+	public ParseResult parseNonEmptyToken(LoadContext context, VarHolder obj, String value)
 	{
 		//TODO These instanceof checks will fail - the VarHolder is a proxy :(
 		if (obj instanceof Ungranted)
diff --git a/code/src/java/plugin/lsttokens/ModifyOtherLst.java b/code/src/java/plugin/lsttokens/ModifyOtherLst.java
index 58a53ad7848..375110dedff 100644
--- a/code/src/java/plugin/lsttokens/ModifyOtherLst.java
+++ b/code/src/java/plugin/lsttokens/ModifyOtherLst.java
@@ -41,7 +41,7 @@
 import pcgen.cdom.grouping.GroupingCollection;
 import pcgen.core.Campaign;
 import pcgen.rules.context.LoadContext;
-import pcgen.rules.persistence.token.AbstractTokenWithSeparator;
+import pcgen.rules.persistence.token.AbstractNonEmptyToken;
 import pcgen.rules.persistence.token.CDOMInterfaceToken;
 import pcgen.rules.persistence.token.CDOMPrimaryToken;
 import pcgen.rules.persistence.token.ParseResult;
@@ -50,7 +50,7 @@
  * Implements the MODIFYOTHER token for remotely modifying variables in the new variable
  * system.
  */
-public class ModifyOtherLst extends AbstractTokenWithSeparator<VarHolder>
+public class ModifyOtherLst extends AbstractNonEmptyToken<VarHolder>
 		implements CDOMInterfaceToken<VarContainer, VarHolder>, CDOMPrimaryToken<VarHolder>
 {
 
@@ -60,15 +60,9 @@ public String getTokenName()
 		return "MODIFYOTHER";
 	}
 
-	@Override
-	protected char separator()
-	{
-		return '|';
-	}
-
 	//MODIFYOTHER:EQUIPMENT|GROUP=Martial|EqCritRange|ADD|1
 	@Override
-	protected ParseResult parseTokenWithSeparator(LoadContext context, VarHolder obj, String value)
+	public ParseResult parseNonEmptyToken(LoadContext context, VarHolder obj, String value)
 	{
 		//TODO These instanceof checks will fail - the VarHolder is a proxy :(
 		if (obj instanceof Ungranted)