5775 files changed, 35 insertions, 25 deletions

diff --git a/configure.ac b/configure.ac
index 24cb240e..d091832d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -139,6 +139,10 @@ AC_OUTPUT([
 	ragel/host-rust/Makefile
 	ragel/host-crack/Makefile
 	ragel/host-js/Makefile
+	test/Makefile
+	test/aapl.d/Makefile
+	test/colm.d/Makefile
+	test/ragel.d/Makefile
 	doc/Makefile
 ])
 
diff --git a/test/Makefile.am b/test/Makefile.am
index 465601e8..85c9ed68 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1 +1 @@
-SUBDIRS = cases
+SUBDIRS = aapl.d colm.d ragel.d
diff --git a/test/cases/aapl.d/.gitignore b/test/aapl.d/.gitignore
index a20afeb7..a20afeb7 100644
--- a/test/cases/aapl.d/.gitignore
+++ b/test/aapl.d/.gitignore
diff --git a/test/cases/aapl.d/Makefile.am b/test/aapl.d/Makefile.am
index 5fae63f4..206f93b4 100644
--- a/test/cases/aapl.d/Makefile.am
+++ b/test/aapl.d/Makefile.am
@@ -2,7 +2,7 @@
 #   Copyright 2001, 2002 Adrian Thurston <thurston@cs.queensu.ca>
 #
 
-CPPFLAGS = @AAPL_CPPFLAGS@
+CPPFLAGS = -I ../../aapl
 
 noinst_PROGRAMS = \
 	stress_avltree stress_avliter stress_avlmel \
@@ -59,7 +59,7 @@ test_string_SOURCES = test_string.cpp util.cpp
 test_rope_SOURCES = test_rope.cpp util.cpp
 
 gentests: gentests.sh Makefile
-	@$(top_srcdir)/sedsubst $< $@ -w,+x $(SED_SUBST)
+	@$(top_srcdir)/test/sedsubst $< $@ -w,+x $(SED_SUBST)
 
 #*************************************
 
diff --git a/test/cases/aapl.d/avlverify.h b/test/aapl.d/avlverify.h
index 5c6f8324..5c6f8324 100644
--- a/test/cases/aapl.d/avlverify.h
+++ b/test/aapl.d/avlverify.h
diff --git a/test/cases/aapl.d/gentests.sh b/test/aapl.d/gentests.sh
index 10394b00..10394b00 100644
--- a/test/cases/aapl.d/gentests.sh
+++ b/test/aapl.d/gentests.sh
diff --git a/test/cases/aapl.d/stress_allsort.cpp b/test/aapl.d/stress_allsort.cpp
index aaf3c55e..aaf3c55e 100644
--- a/test/cases/aapl.d/stress_allsort.cpp
+++ b/test/aapl.d/stress_allsort.cpp
diff --git a/test/cases/aapl.d/stress_avlimap.cpp b/test/aapl.d/stress_avlimap.cpp
index e6477422..e6477422 100644
--- a/test/cases/aapl.d/stress_avlimap.cpp
+++ b/test/aapl.d/stress_avlimap.cpp
diff --git a/test/cases/aapl.d/stress_avlimel.cpp b/test/aapl.d/stress_avlimel.cpp
index 6e7c0d20..6e7c0d20 100644
--- a/test/cases/aapl.d/stress_avlimel.cpp
+++ b/test/aapl.d/stress_avlimel.cpp
diff --git a/test/cases/aapl.d/stress_avlimelkey.cpp b/test/aapl.d/stress_avlimelkey.cpp
index c0e3bcfa..c0e3bcfa 100644
--- a/test/cases/aapl.d/stress_avlimelkey.cpp
+++ b/test/aapl.d/stress_avlimelkey.cpp
diff --git a/test/cases/aapl.d/stress_avliset.cpp b/test/aapl.d/stress_avliset.cpp
index 0d19a7b2..0d19a7b2 100644
--- a/test/cases/aapl.d/stress_avliset.cpp
+++ b/test/aapl.d/stress_avliset.cpp
diff --git a/test/cases/aapl.d/stress_avliter.cpp b/test/aapl.d/stress_avliter.cpp
index e3368490..e3368490 100644
--- a/test/cases/aapl.d/stress_avliter.cpp
+++ b/test/aapl.d/stress_avliter.cpp
diff --git a/test/cases/aapl.d/stress_avlitree.cpp b/test/aapl.d/stress_avlitree.cpp
index 4f92a366..4f92a366 100644
--- a/test/cases/aapl.d/stress_avlitree.cpp
+++ b/test/aapl.d/stress_avlitree.cpp
diff --git a/test/cases/aapl.d/stress_avlmap.cpp b/test/aapl.d/stress_avlmap.cpp
index 088b42f4..088b42f4 100644
--- a/test/cases/aapl.d/stress_avlmap.cpp
+++ b/test/aapl.d/stress_avlmap.cpp
diff --git a/test/cases/aapl.d/stress_avlmel.cpp b/test/aapl.d/stress_avlmel.cpp
index 6d16efb3..6d16efb3 100644
--- a/test/cases/aapl.d/stress_avlmel.cpp
+++ b/test/aapl.d/stress_avlmel.cpp
diff --git a/test/cases/aapl.d/stress_avlmelkey.cpp b/test/aapl.d/stress_avlmelkey.cpp
index adaef911..adaef911 100644
--- a/test/cases/aapl.d/stress_avlmelkey.cpp
+++ b/test/aapl.d/stress_avlmelkey.cpp
diff --git a/test/cases/aapl.d/stress_avlset.cpp b/test/aapl.d/stress_avlset.cpp
index ec54660a..ec54660a 100644
--- a/test/cases/aapl.d/stress_avlset.cpp
+++ b/test/aapl.d/stress_avlset.cpp
diff --git a/test/cases/aapl.d/stress_avltree.cpp b/test/aapl.d/stress_avltree.cpp
index 9623b4dd..9623b4dd 100644
--- a/test/cases/aapl.d/stress_avltree.cpp
+++ b/test/aapl.d/stress_avltree.cpp
diff --git a/test/cases/aapl.d/stress_stblsort.cpp b/test/aapl.d/stress_stblsort.cpp
index 8ba2ba19..8ba2ba19 100644
--- a/test/cases/aapl.d/stress_stblsort.cpp
+++ b/test/aapl.d/stress_stblsort.cpp
diff --git a/test/cases/aapl.d/stress_svector.cpp b/test/aapl.d/stress_svector.cpp
index e106150e..e106150e 100644
--- a/test/cases/aapl.d/stress_svector.cpp
+++ b/test/aapl.d/stress_svector.cpp
diff --git a/test/cases/aapl.d/stress_svectsimp.cpp b/test/aapl.d/stress_svectsimp.cpp
index febeb1c5..febeb1c5 100644
--- a/test/cases/aapl.d/stress_svectsimp.cpp
+++ b/test/aapl.d/stress_svectsimp.cpp
diff --git a/test/cases/aapl.d/test_allavl.cpp b/test/aapl.d/test_allavl.cpp
index 4d7b6278..4d7b6278 100644
--- a/test/cases/aapl.d/test_allavl.cpp
+++ b/test/aapl.d/test_allavl.cpp
diff --git a/test/cases/aapl.d/test_allavl.exp b/test/aapl.d/test_allavl.exp
index e69de29b..e69de29b 100644
--- a/test/cases/aapl.d/test_allavl.exp
+++ b/test/aapl.d/test_allavl.exp
diff --git a/test/cases/aapl.d/test_allsort.cpp b/test/aapl.d/test_allsort.cpp
index 4f738614..4f738614 100644
--- a/test/cases/aapl.d/test_allsort.cpp
+++ b/test/aapl.d/test_allsort.cpp
diff --git a/test/cases/aapl.d/test_allsort.exp b/test/aapl.d/test_allsort.exp
index e8ab71f5..e8ab71f5 100644
--- a/test/cases/aapl.d/test_allsort.exp
+++ b/test/aapl.d/test_allsort.exp
diff --git a/test/cases/aapl.d/test_avlikeyless.cpp b/test/aapl.d/test_avlikeyless.cpp
index 7ea5e6a0..7ea5e6a0 100644
--- a/test/cases/aapl.d/test_avlikeyless.cpp
+++ b/test/aapl.d/test_avlikeyless.cpp
diff --git a/test/cases/aapl.d/test_avlikeyless.exp b/test/aapl.d/test_avlikeyless.exp
index e69de29b..e69de29b 100644
--- a/test/cases/aapl.d/test_avlikeyless.exp
+++ b/test/aapl.d/test_avlikeyless.exp
diff --git a/test/cases/aapl.d/test_avliter.cpp b/test/aapl.d/test_avliter.cpp
index d09c0a3e..d09c0a3e 100644
--- a/test/cases/aapl.d/test_avliter.cpp
+++ b/test/aapl.d/test_avliter.cpp
diff --git a/test/cases/aapl.d/test_avliter.exp b/test/aapl.d/test_avliter.exp
index 90f905d5..90f905d5 100644
--- a/test/cases/aapl.d/test_avliter.exp
+++ b/test/aapl.d/test_avliter.exp
diff --git a/test/cases/aapl.d/test_avlkeyless.cpp b/test/aapl.d/test_avlkeyless.cpp
index 79f73f88..79f73f88 100644
--- a/test/cases/aapl.d/test_avlkeyless.cpp
+++ b/test/aapl.d/test_avlkeyless.cpp
diff --git a/test/cases/aapl.d/test_avlkeyless.exp b/test/aapl.d/test_avlkeyless.exp
index e69de29b..e69de29b 100644
--- a/test/cases/aapl.d/test_avlkeyless.exp
+++ b/test/aapl.d/test_avlkeyless.exp
diff --git a/test/cases/aapl.d/test_bstmap.cpp b/test/aapl.d/test_bstmap.cpp
index 855ff5c6..855ff5c6 100644
--- a/test/cases/aapl.d/test_bstmap.cpp
+++ b/test/aapl.d/test_bstmap.cpp
diff --git a/test/cases/aapl.d/test_bstmap.exp b/test/aapl.d/test_bstmap.exp
index 539f3392..539f3392 100644
--- a/test/cases/aapl.d/test_bstmap.exp
+++ b/test/aapl.d/test_bstmap.exp
diff --git a/test/cases/aapl.d/test_bstset.cpp b/test/aapl.d/test_bstset.cpp
index 20211c33..20211c33 100644
--- a/test/cases/aapl.d/test_bstset.cpp
+++ b/test/aapl.d/test_bstset.cpp
diff --git a/test/cases/aapl.d/test_bstset.exp b/test/aapl.d/test_bstset.exp
index ef239da5..ef239da5 100644
--- a/test/cases/aapl.d/test_bstset.exp
+++ b/test/aapl.d/test_bstset.exp
diff --git a/test/cases/aapl.d/test_bsttable.cpp b/test/aapl.d/test_bsttable.cpp
index e9476218..e9476218 100644
--- a/test/cases/aapl.d/test_bsttable.cpp
+++ b/test/aapl.d/test_bsttable.cpp
diff --git a/test/cases/aapl.d/test_bsttable.exp b/test/aapl.d/test_bsttable.exp
index bb0c1052..bb0c1052 100644
--- a/test/cases/aapl.d/test_bsttable.exp
+++ b/test/aapl.d/test_bsttable.exp
diff --git a/test/cases/aapl.d/test_bubblesort.cpp b/test/aapl.d/test_bubblesort.cpp
index 4edd33fa..4edd33fa 100644
--- a/test/cases/aapl.d/test_bubblesort.cpp
+++ b/test/aapl.d/test_bubblesort.cpp
diff --git a/test/cases/aapl.d/test_bubblesort.exp b/test/aapl.d/test_bubblesort.exp
index a6d22f6f..a6d22f6f 100644
--- a/test/cases/aapl.d/test_bubblesort.exp
+++ b/test/aapl.d/test_bubblesort.exp
diff --git a/test/cases/aapl.d/test_compare.cpp b/test/aapl.d/test_compare.cpp
index f7673879..f7673879 100644
--- a/test/cases/aapl.d/test_compare.cpp
+++ b/test/aapl.d/test_compare.cpp
diff --git a/test/cases/aapl.d/test_compare.exp b/test/aapl.d/test_compare.exp
index e69de29b..e69de29b 100644
--- a/test/cases/aapl.d/test_compare.exp
+++ b/test/aapl.d/test_compare.exp
diff --git a/test/cases/aapl.d/test_dlistval.cpp b/test/aapl.d/test_dlistval.cpp
index dfcedf08..dfcedf08 100644
--- a/test/cases/aapl.d/test_dlistval.cpp
+++ b/test/aapl.d/test_dlistval.cpp
diff --git a/test/cases/aapl.d/test_dlistval.exp b/test/aapl.d/test_dlistval.exp
index 2833a585..2833a585 100644
--- a/test/cases/aapl.d/test_dlistval.exp
+++ b/test/aapl.d/test_dlistval.exp
diff --git a/test/cases/aapl.d/test_doublelist.cpp b/test/aapl.d/test_doublelist.cpp
index 5367262a..5367262a 100644
--- a/test/cases/aapl.d/test_doublelist.cpp
+++ b/test/aapl.d/test_doublelist.cpp
diff --git a/test/cases/aapl.d/test_doublelist.exp b/test/aapl.d/test_doublelist.exp
index b52d7e05..b52d7e05 100644
--- a/test/cases/aapl.d/test_doublelist.exp
+++ b/test/aapl.d/test_doublelist.exp
diff --git a/test/cases/aapl.d/test_insertsort.cpp b/test/aapl.d/test_insertsort.cpp
index 511e29de..511e29de 100644
--- a/test/cases/aapl.d/test_insertsort.cpp
+++ b/test/aapl.d/test_insertsort.cpp
diff --git a/test/cases/aapl.d/test_insertsort.exp b/test/aapl.d/test_insertsort.exp
index e69de29b..e69de29b 100644
--- a/test/cases/aapl.d/test_insertsort.exp
+++ b/test/aapl.d/test_insertsort.exp
diff --git a/test/cases/aapl.d/test_mergesort.cpp b/test/aapl.d/test_mergesort.cpp
index 5d9981e7..5d9981e7 100644
--- a/test/cases/aapl.d/test_mergesort.cpp
+++ b/test/aapl.d/test_mergesort.cpp
diff --git a/test/cases/aapl.d/test_mergesort.exp b/test/aapl.d/test_mergesort.exp
index e69de29b..e69de29b 100644
--- a/test/cases/aapl.d/test_mergesort.exp
+++ b/test/aapl.d/test_mergesort.exp
diff --git a/test/cases/aapl.d/test_quicksort.cpp b/test/aapl.d/test_quicksort.cpp
index 37dfc3ad..37dfc3ad 100644
--- a/test/cases/aapl.d/test_quicksort.cpp
+++ b/test/aapl.d/test_quicksort.cpp
diff --git a/test/cases/aapl.d/test_quicksort.exp b/test/aapl.d/test_quicksort.exp
index e69de29b..e69de29b 100644
--- a/test/cases/aapl.d/test_quicksort.exp
+++ b/test/aapl.d/test_quicksort.exp
diff --git a/test/cases/aapl.d/test_rope.cpp b/test/aapl.d/test_rope.cpp
index 681bc66a..681bc66a 100644
--- a/test/cases/aapl.d/test_rope.cpp
+++ b/test/aapl.d/test_rope.cpp
diff --git a/test/cases/aapl.d/test_rope.exp b/test/aapl.d/test_rope.exp
index 3d5bd416..3d5bd416 100644
--- a/test/cases/aapl.d/test_rope.exp
+++ b/test/aapl.d/test_rope.exp
diff --git a/test/cases/aapl.d/test_sbstmap.cpp b/test/aapl.d/test_sbstmap.cpp
index f07dc6f1..f07dc6f1 100644
--- a/test/cases/aapl.d/test_sbstmap.cpp
+++ b/test/aapl.d/test_sbstmap.cpp
diff --git a/test/cases/aapl.d/test_sbstmap.exp b/test/aapl.d/test_sbstmap.exp
index e69de29b..e69de29b 100644
--- a/test/cases/aapl.d/test_sbstmap.exp
+++ b/test/aapl.d/test_sbstmap.exp
diff --git a/test/cases/aapl.d/test_sbstset.cpp b/test/aapl.d/test_sbstset.cpp
index 04f7306a..04f7306a 100644
--- a/test/cases/aapl.d/test_sbstset.cpp
+++ b/test/aapl.d/test_sbstset.cpp
diff --git a/test/cases/aapl.d/test_sbstset.exp b/test/aapl.d/test_sbstset.exp
index a9772a02..a9772a02 100644
--- a/test/cases/aapl.d/test_sbstset.exp
+++ b/test/aapl.d/test_sbstset.exp
diff --git a/test/cases/aapl.d/test_sbsttable.cpp b/test/aapl.d/test_sbsttable.cpp
index cdba3c58..cdba3c58 100644
--- a/test/cases/aapl.d/test_sbsttable.cpp
+++ b/test/aapl.d/test_sbsttable.cpp
diff --git a/test/cases/aapl.d/test_sbsttable.exp b/test/aapl.d/test_sbsttable.exp
index 9986c721..9986c721 100644
--- a/test/cases/aapl.d/test_sbsttable.exp
+++ b/test/aapl.d/test_sbsttable.exp
diff --git a/test/cases/aapl.d/test_string.cpp b/test/aapl.d/test_string.cpp
index 6a6b25d5..6a6b25d5 100644
--- a/test/cases/aapl.d/test_string.cpp
+++ b/test/aapl.d/test_string.cpp
diff --git a/test/cases/aapl.d/test_string.exp b/test/aapl.d/test_string.exp
index 24fead3b..24fead3b 100644
--- a/test/cases/aapl.d/test_string.exp
+++ b/test/aapl.d/test_string.exp
diff --git a/test/cases/aapl.d/test_svector.cpp b/test/aapl.d/test_svector.cpp
index 96345f9d..96345f9d 100644
--- a/test/cases/aapl.d/test_svector.cpp
+++ b/test/aapl.d/test_svector.cpp
diff --git a/test/cases/aapl.d/test_svector.exp b/test/aapl.d/test_svector.exp
index 4f121649..4f121649 100644
--- a/test/cases/aapl.d/test_svector.exp
+++ b/test/aapl.d/test_svector.exp
diff --git a/test/cases/aapl.d/test_svectsimp.cpp b/test/aapl.d/test_svectsimp.cpp
index d193b996..d193b996 100644
--- a/test/cases/aapl.d/test_svectsimp.cpp
+++ b/test/aapl.d/test_svectsimp.cpp
diff --git a/test/cases/aapl.d/test_tavltree.cpp b/test/aapl.d/test_tavltree.cpp
index 5b6fc282..5b6fc282 100644
--- a/test/cases/aapl.d/test_tavltree.cpp
+++ b/test/aapl.d/test_tavltree.cpp
diff --git a/test/cases/aapl.d/test_tdlist.cpp b/test/aapl.d/test_tdlist.cpp
index cb421332..cb421332 100644
--- a/test/cases/aapl.d/test_tdlist.cpp
+++ b/test/aapl.d/test_tdlist.cpp
diff --git a/test/cases/aapl.d/test_tdlistall.cpp b/test/aapl.d/test_tdlistall.cpp
index 9ccb3fd3..9ccb3fd3 100644
--- a/test/cases/aapl.d/test_tdlistall.cpp
+++ b/test/aapl.d/test_tdlistall.cpp
diff --git a/test/cases/aapl.d/test_tdlistmel.cpp b/test/aapl.d/test_tdlistmel.cpp
index a435a393..a435a393 100644
--- a/test/cases/aapl.d/test_tdlistmel.cpp
+++ b/test/aapl.d/test_tdlistmel.cpp
diff --git a/test/cases/aapl.d/test_tdlistval.cpp b/test/aapl.d/test_tdlistval.cpp
index efb27a63..efb27a63 100644
--- a/test/cases/aapl.d/test_tdlistval.cpp
+++ b/test/aapl.d/test_tdlistval.cpp
diff --git a/test/cases/aapl.d/test_tsvectsimp.cpp b/test/aapl.d/test_tsvectsimp.cpp
index ce7dd6b2..ce7dd6b2 100644
--- a/test/cases/aapl.d/test_tsvectsimp.cpp
+++ b/test/aapl.d/test_tsvectsimp.cpp
diff --git a/test/cases/aapl.d/test_tvectsimp.cpp b/test/aapl.d/test_tvectsimp.cpp
index 61deeb8f..61deeb8f 100644
--- a/test/cases/aapl.d/test_tvectsimp.cpp
+++ b/test/aapl.d/test_tvectsimp.cpp
diff --git a/test/cases/aapl.d/test_vector.cpp b/test/aapl.d/test_vector.cpp
index 638538de..638538de 100644
--- a/test/cases/aapl.d/test_vector.cpp
+++ b/test/aapl.d/test_vector.cpp
diff --git a/test/cases/aapl.d/test_vector.exp b/test/aapl.d/test_vector.exp
index ff323b39..ff323b39 100644
--- a/test/cases/aapl.d/test_vector.exp
+++ b/test/aapl.d/test_vector.exp
diff --git a/test/cases/aapl.d/test_vectsimp.cpp b/test/aapl.d/test_vectsimp.cpp
index 3f80a562..3f80a562 100644
--- a/test/cases/aapl.d/test_vectsimp.cpp
+++ b/test/aapl.d/test_vectsimp.cpp
diff --git a/test/cases/aapl.d/util.cpp b/test/aapl.d/util.cpp
index 47afa3ff..47afa3ff 100644
--- a/test/cases/aapl.d/util.cpp
+++ b/test/aapl.d/util.cpp
diff --git a/test/cases/aapl.d/util.h b/test/aapl.d/util.h
index 3d272d93..3d272d93 100644
--- a/test/cases/aapl.d/util.h
+++ b/test/aapl.d/util.h
diff --git a/test/cases/colm.d/Makefile.am b/test/cases/colm.d/Makefile.am
deleted file mode 100644
index 13570fe0..00000000
--- a/test/cases/colm.d/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-noinst_SCRIPTS = gentests subject.mk subject.pl subject.sh
-
-gentests: gentests.sh Makefile
-	@$(top_srcdir)/sedsubst $< $@ -w,+x $(SED_SUBST)
-
-subject.mk: subject.mk.in Makefile
-	@$(top_srcdir)/sedsubst $< $@ -w,+x $(SED_SUBST)
-
-subject.pl: subject.pl.in Makefile
-	@$(top_srcdir)/sedsubst $< $@ -w,+x $(SED_SUBST)
-
-subject.sh: subject.sh.in Makefile
-	@$(top_srcdir)/sedsubst $< $@ -w,+x $(SED_SUBST)
diff --git a/test/cases/colm.d/.gitignore b/test/colm.d/.gitignore
index 4c9512f8..4c9512f8 100644
--- a/test/cases/colm.d/.gitignore
+++ b/test/colm.d/.gitignore
diff --git a/test/colm.d/Makefile.am b/test/colm.d/Makefile.am
new file mode 100644
index 00000000..a67fc99e
--- /dev/null
+++ b/test/colm.d/Makefile.am
@@ -0,0 +1,15 @@
+noinst_SCRIPTS = gentests subject.mk subject.pl subject.sh
+
+SED_SUBST = 's/@NO_EFFECT@//'
+
+gentests: gentests.sh Makefile
+	@$(top_srcdir)/test/sedsubst $< $@ -w,+x $(SED_SUBST)
+
+subject.mk: subject.mk.in Makefile
+	@$(top_srcdir)/test/sedsubst $< $@ -w,+x $(SED_SUBST)
+
+subject.pl: subject.pl.in Makefile
+	@$(top_srcdir)/test/sedsubst $< $@ -w,+x $(SED_SUBST)
+
+subject.sh: subject.sh.in Makefile
+	@$(top_srcdir)/test/sedsubst $< $@ -w,+x $(SED_SUBST)
diff --git a/test/cases/colm.d/TESTS b/test/colm.d/TESTS
index bdb2fe75..bdb2fe75 100644
--- a/test/cases/colm.d/TESTS
+++ b/test/colm.d/TESTS
diff --git a/test/cases/colm.d/accum1.lm b/test/colm.d/accum1.lm
index a131fdad..a131fdad 100644
--- a/test/cases/colm.d/accum1.lm
+++ b/test/colm.d/accum1.lm
diff --git a/test/cases/colm.d/accum2.lm b/test/colm.d/accum2.lm
index 9e62be6a..9e62be6a 100644
--- a/test/cases/colm.d/accum2.lm
+++ b/test/colm.d/accum2.lm
diff --git a/test/cases/colm.d/accum3.lm b/test/colm.d/accum3.lm
index efc880b0..efc880b0 100644
--- a/test/cases/colm.d/accum3.lm
+++ b/test/colm.d/accum3.lm
diff --git a/test/cases/colm.d/accumbt1.lm b/test/colm.d/accumbt1.lm
index 5dd19f56..5dd19f56 100644
--- a/test/cases/colm.d/accumbt1.lm
+++ b/test/colm.d/accumbt1.lm
diff --git a/test/cases/colm.d/accumbt2.lm b/test/colm.d/accumbt2.lm
index 66024e6d..66024e6d 100644
--- a/test/cases/colm.d/accumbt2.lm
+++ b/test/colm.d/accumbt2.lm
diff --git a/test/cases/colm.d/accumbt3.lm b/test/colm.d/accumbt3.lm
index 6d039451..6d039451 100644
--- a/test/cases/colm.d/accumbt3.lm
+++ b/test/colm.d/accumbt3.lm
diff --git a/test/cases/colm.d/argv1.lm b/test/colm.d/argv1.lm
index 8369fb51..8369fb51 100644
--- a/test/cases/colm.d/argv1.lm
+++ b/test/colm.d/argv1.lm
diff --git a/test/cases/colm.d/argv2.lm b/test/colm.d/argv2.lm
index 024ed487..024ed487 100644
--- a/test/cases/colm.d/argv2.lm
+++ b/test/colm.d/argv2.lm
diff --git a/test/cases/colm.d/backtrack1.lm b/test/colm.d/backtrack1.lm
index 289bb764..289bb764 100644
--- a/test/cases/colm.d/backtrack1.lm
+++ b/test/colm.d/backtrack1.lm
diff --git a/test/cases/colm.d/backtrack2.lm b/test/colm.d/backtrack2.lm
index 89589cfb..89589cfb 100644
--- a/test/cases/colm.d/backtrack2.lm
+++ b/test/colm.d/backtrack2.lm
diff --git a/test/cases/colm.d/backtrack3.lm b/test/colm.d/backtrack3.lm
index 45e07882..45e07882 100644
--- a/test/cases/colm.d/backtrack3.lm
+++ b/test/colm.d/backtrack3.lm
diff --git a/test/cases/colm.d/binary1.in b/test/colm.d/binary1.in
index 8da7d3dc..8da7d3dc 100644
--- a/test/cases/colm.d/binary1.in
+++ b/test/colm.d/binary1.in
diff --git a/test/cases/colm.d/binary1.lm b/test/colm.d/binary1.lm
index 93392d00..93392d00 100644
--- a/test/cases/colm.d/binary1.lm
+++ b/test/colm.d/binary1.lm
diff --git a/test/cases/colm.d/broken/travs2.lm b/test/colm.d/broken/travs2.lm
index 4f780e53..4f780e53 100644
--- a/test/cases/colm.d/broken/travs2.lm
+++ b/test/colm.d/broken/travs2.lm
diff --git a/test/cases/colm.d/btscan1.lm b/test/colm.d/btscan1.lm
index b17ac0fc..b17ac0fc 100644
--- a/test/cases/colm.d/btscan1.lm
+++ b/test/colm.d/btscan1.lm
diff --git a/test/cases/colm.d/btscan2.lm b/test/colm.d/btscan2.lm
index bce516f2..bce516f2 100644
--- a/test/cases/colm.d/btscan2.lm
+++ b/test/colm.d/btscan2.lm
diff --git a/test/cases/colm.d/call1.lm b/test/colm.d/call1.lm
index 51fa0ab5..51fa0ab5 100644
--- a/test/cases/colm.d/call1.lm
+++ b/test/colm.d/call1.lm
diff --git a/test/cases/colm.d/collect.lm b/test/colm.d/collect.lm
index a0f3b7e8..a0f3b7e8 100644
--- a/test/cases/colm.d/collect.lm
+++ b/test/colm.d/collect.lm
diff --git a/test/cases/colm.d/commitbt.lm b/test/colm.d/commitbt.lm
index 0b42bd04..0b42bd04 100644
--- a/test/cases/colm.d/commitbt.lm
+++ b/test/colm.d/commitbt.lm
diff --git a/test/cases/colm.d/concat1.lm b/test/colm.d/concat1.lm
index 3e2f0427..3e2f0427 100644
--- a/test/cases/colm.d/concat1.lm
+++ b/test/colm.d/concat1.lm
diff --git a/test/cases/colm.d/concat2.lm b/test/colm.d/concat2.lm
index 2d014e90..2d014e90 100644
--- a/test/cases/colm.d/concat2.lm
+++ b/test/colm.d/concat2.lm
diff --git a/test/cases/colm.d/construct1.lm b/test/colm.d/construct1.lm
index 44b1534f..44b1534f 100644
--- a/test/cases/colm.d/construct1.lm
+++ b/test/colm.d/construct1.lm
diff --git a/test/cases/colm.d/construct2.lm b/test/colm.d/construct2.lm
index eacf7ea1..eacf7ea1 100644
--- a/test/cases/colm.d/construct2.lm
+++ b/test/colm.d/construct2.lm
diff --git a/test/cases/colm.d/construct3.lm b/test/colm.d/construct3.lm
index 24ef78a7..24ef78a7 100644
--- a/test/cases/colm.d/construct3.lm
+++ b/test/colm.d/construct3.lm
diff --git a/test/cases/colm.d/construct4.lm b/test/colm.d/construct4.lm
index 3232978a..3232978a 100644
--- a/test/cases/colm.d/construct4.lm
+++ b/test/colm.d/construct4.lm
diff --git a/test/cases/colm.d/constructex.lm b/test/colm.d/constructex.lm
index 21f7c7c1..21f7c7c1 100644
--- a/test/cases/colm.d/constructex.lm
+++ b/test/colm.d/constructex.lm
diff --git a/test/cases/colm.d/context1.lm b/test/colm.d/context1.lm
index 7da536db..7da536db 100644
--- a/test/cases/colm.d/context1.lm
+++ b/test/colm.d/context1.lm
diff --git a/test/cases/colm.d/context2.lm b/test/colm.d/context2.lm
index 03d177a4..03d177a4 100644
--- a/test/cases/colm.d/context2.lm
+++ b/test/colm.d/context2.lm
diff --git a/test/cases/colm.d/context3.lm b/test/colm.d/context3.lm
index 602f504f..602f504f 100644
--- a/test/cases/colm.d/context3.lm
+++ b/test/colm.d/context3.lm
diff --git a/test/cases/colm.d/counting1.lm b/test/colm.d/counting1.lm
index 8bfac630..8bfac630 100644
--- a/test/cases/colm.d/counting1.lm
+++ b/test/colm.d/counting1.lm
diff --git a/test/cases/colm.d/counting2.lm b/test/colm.d/counting2.lm
index 76c4fd07..76c4fd07 100644
--- a/test/cases/colm.d/counting2.lm
+++ b/test/colm.d/counting2.lm
diff --git a/test/cases/colm.d/counting3.lm b/test/colm.d/counting3.lm
index a45fc779..a45fc779 100644
--- a/test/cases/colm.d/counting3.lm
+++ b/test/colm.d/counting3.lm
diff --git a/test/cases/colm.d/counting4.lm b/test/colm.d/counting4.lm
index 5f8c8602..5f8c8602 100644
--- a/test/cases/colm.d/counting4.lm
+++ b/test/colm.d/counting4.lm
diff --git a/test/cases/colm.d/decl1.lm b/test/colm.d/decl1.lm
index 23d79199..23d79199 100644
--- a/test/cases/colm.d/decl1.lm
+++ b/test/colm.d/decl1.lm
diff --git a/test/cases/colm.d/decl2.lm b/test/colm.d/decl2.lm
index 0bd20886..0bd20886 100644
--- a/test/cases/colm.d/decl2.lm
+++ b/test/colm.d/decl2.lm
diff --git a/test/cases/colm.d/decl3.lm b/test/colm.d/decl3.lm
index 344093d5..344093d5 100644
--- a/test/cases/colm.d/decl3.lm
+++ b/test/colm.d/decl3.lm
diff --git a/test/cases/colm.d/define1.lm b/test/colm.d/define1.lm
index 375e1b1f..375e1b1f 100644
--- a/test/cases/colm.d/define1.lm
+++ b/test/colm.d/define1.lm
diff --git a/test/cases/colm.d/div.lm b/test/colm.d/div.lm
index 4a647e13..4a647e13 100644
--- a/test/cases/colm.d/div.lm
+++ b/test/colm.d/div.lm
diff --git a/test/cases/colm.d/exit1.lm b/test/colm.d/exit1.lm
index efc05495..efc05495 100644
--- a/test/cases/colm.d/exit1.lm
+++ b/test/colm.d/exit1.lm
diff --git a/test/cases/colm.d/exit2.lm b/test/colm.d/exit2.lm
index 86cadb97..86cadb97 100644
--- a/test/cases/colm.d/exit2.lm
+++ b/test/colm.d/exit2.lm
diff --git a/test/cases/colm.d/exit3.lm b/test/colm.d/exit3.lm
index df9ef99c..df9ef99c 100644
--- a/test/cases/colm.d/exit3.lm
+++ b/test/colm.d/exit3.lm
diff --git a/test/cases/colm.d/exit4.lm b/test/colm.d/exit4.lm
index 3e2d1389..3e2d1389 100644
--- a/test/cases/colm.d/exit4.lm
+++ b/test/colm.d/exit4.lm
diff --git a/test/cases/colm.d/exit5.lm b/test/colm.d/exit5.lm
index c6d4336d..c6d4336d 100644
--- a/test/cases/colm.d/exit5.lm
+++ b/test/colm.d/exit5.lm
diff --git a/test/cases/colm.d/exit6.lm b/test/colm.d/exit6.lm
index 3595d93e..3595d93e 100644
--- a/test/cases/colm.d/exit6.lm
+++ b/test/colm.d/exit6.lm
diff --git a/test/cases/colm.d/export1.lm b/test/colm.d/export1.lm
index 785452c6..785452c6 100644
--- a/test/cases/colm.d/export1.lm
+++ b/test/colm.d/export1.lm
diff --git a/test/cases/colm.d/ext1.lm b/test/colm.d/ext1.lm
index 9689227f..9689227f 100644
--- a/test/cases/colm.d/ext1.lm
+++ b/test/colm.d/ext1.lm
diff --git a/test/cases/colm.d/factor1.lm b/test/colm.d/factor1.lm
index 982545b7..982545b7 100644
--- a/test/cases/colm.d/factor1.lm
+++ b/test/colm.d/factor1.lm
diff --git a/test/cases/colm.d/factor2.lm b/test/colm.d/factor2.lm
index 08c688da..08c688da 100644
--- a/test/cases/colm.d/factor2.lm
+++ b/test/colm.d/factor2.lm
diff --git a/test/cases/colm.d/factor3.lm b/test/colm.d/factor3.lm
index 2ed2a6b7..2ed2a6b7 100644
--- a/test/cases/colm.d/factor3.lm
+++ b/test/colm.d/factor3.lm
diff --git a/test/cases/colm.d/factor4.lm b/test/colm.d/factor4.lm
index 765559f6..765559f6 100644
--- a/test/cases/colm.d/factor4.lm
+++ b/test/colm.d/factor4.lm
diff --git a/test/cases/colm.d/factor5.lm b/test/colm.d/factor5.lm
index 8c52f54b..8c52f54b 100644
--- a/test/cases/colm.d/factor5.lm
+++ b/test/colm.d/factor5.lm
diff --git a/test/cases/colm.d/factor6.lm b/test/colm.d/factor6.lm
index c257f8e1..c257f8e1 100644
--- a/test/cases/colm.d/factor6.lm
+++ b/test/colm.d/factor6.lm
diff --git a/test/cases/colm.d/forloop1.lm b/test/colm.d/forloop1.lm
index 37b378e7..37b378e7 100644
--- a/test/cases/colm.d/forloop1.lm
+++ b/test/colm.d/forloop1.lm
diff --git a/test/cases/colm.d/forloop2.lm b/test/colm.d/forloop2.lm
index 63120eee..63120eee 100644
--- a/test/cases/colm.d/forloop2.lm
+++ b/test/colm.d/forloop2.lm
diff --git a/test/cases/colm.d/forloop3.lm b/test/colm.d/forloop3.lm
index 7952e09c..7952e09c 100644
--- a/test/cases/colm.d/forloop3.lm
+++ b/test/colm.d/forloop3.lm
diff --git a/test/cases/colm.d/func1.lm b/test/colm.d/func1.lm
index 32540f01..32540f01 100644
--- a/test/cases/colm.d/func1.lm
+++ b/test/colm.d/func1.lm
diff --git a/test/cases/colm.d/func2.lm b/test/colm.d/func2.lm
index ee773e2a..ee773e2a 100644
--- a/test/cases/colm.d/func2.lm
+++ b/test/colm.d/func2.lm
diff --git a/test/cases/colm.d/func3.lm b/test/colm.d/func3.lm
index d0e323c1..d0e323c1 100644
--- a/test/cases/colm.d/func3.lm
+++ b/test/colm.d/func3.lm
diff --git a/test/cases/colm.d/func4.lm b/test/colm.d/func4.lm
index 91072e15..91072e15 100644
--- a/test/cases/colm.d/func4.lm
+++ b/test/colm.d/func4.lm
diff --git a/test/cases/colm.d/generate1.lm b/test/colm.d/generate1.lm
index 2ea4c77f..2ea4c77f 100644
--- a/test/cases/colm.d/generate1.lm
+++ b/test/colm.d/generate1.lm
diff --git a/test/cases/colm.d/generate2.lm b/test/colm.d/generate2.lm
index 06dfa2af..06dfa2af 100644
--- a/test/cases/colm.d/generate2.lm
+++ b/test/colm.d/generate2.lm
diff --git a/test/cases/colm.d/gentests.sh b/test/colm.d/gentests.sh
index 817e5ed4..817e5ed4 100644
--- a/test/cases/colm.d/gentests.sh
+++ b/test/colm.d/gentests.sh
diff --git a/test/cases/colm.d/heredoc.lm b/test/colm.d/heredoc.lm
index 96758728..96758728 100644
--- a/test/cases/colm.d/heredoc.lm
+++ b/test/colm.d/heredoc.lm
diff --git a/test/cases/colm.d/ifblock1.lm b/test/colm.d/ifblock1.lm
index e35a877d..e35a877d 100644
--- a/test/cases/colm.d/ifblock1.lm
+++ b/test/colm.d/ifblock1.lm
diff --git a/test/cases/colm.d/ignore1.lm b/test/colm.d/ignore1.lm
index 037b9391..037b9391 100644
--- a/test/cases/colm.d/ignore1.lm
+++ b/test/colm.d/ignore1.lm
diff --git a/test/cases/colm.d/ignore2.lm b/test/colm.d/ignore2.lm
index ef060624..ef060624 100644
--- a/test/cases/colm.d/ignore2.lm
+++ b/test/colm.d/ignore2.lm
diff --git a/test/cases/colm.d/ignore3.lm b/test/colm.d/ignore3.lm
index 81290cb2..81290cb2 100644
--- a/test/cases/colm.d/ignore3.lm
+++ b/test/colm.d/ignore3.lm
diff --git a/test/cases/colm.d/ignore4.lm b/test/colm.d/ignore4.lm
index 859f7979..859f7979 100644
--- a/test/cases/colm.d/ignore4.lm
+++ b/test/colm.d/ignore4.lm
diff --git a/test/cases/colm.d/ignore5.lm b/test/colm.d/ignore5.lm
index 411946a2..411946a2 100644
--- a/test/cases/colm.d/ignore5.lm
+++ b/test/colm.d/ignore5.lm
diff --git a/test/cases/colm.d/include1.lm b/test/colm.d/include1.lm
index 5991ad14..5991ad14 100644
--- a/test/cases/colm.d/include1.lm
+++ b/test/colm.d/include1.lm
diff --git a/test/cases/colm.d/include1a.lmi b/test/colm.d/include1a.lmi
index 5de6f696..5de6f696 100644
--- a/test/cases/colm.d/include1a.lmi
+++ b/test/colm.d/include1a.lmi
diff --git a/test/cases/colm.d/indent.lm b/test/colm.d/indent.lm
index 6ad1d425..6ad1d425 100644
--- a/test/cases/colm.d/indent.lm
+++ b/test/colm.d/indent.lm
diff --git a/test/cases/colm.d/inpush1.lm b/test/colm.d/inpush1.lm
index b92ce22a..b92ce22a 100644
--- a/test/cases/colm.d/inpush1.lm
+++ b/test/colm.d/inpush1.lm
diff --git a/test/cases/colm.d/inpush1a.in b/test/colm.d/inpush1a.in
index 26da0afa..26da0afa 100644
--- a/test/cases/colm.d/inpush1a.in
+++ b/test/colm.d/inpush1a.in
diff --git a/test/cases/colm.d/inpush1b.in b/test/colm.d/inpush1b.in
index 6c574323..6c574323 100644
--- a/test/cases/colm.d/inpush1b.in
+++ b/test/colm.d/inpush1b.in
diff --git a/test/cases/colm.d/inpush1c.in b/test/colm.d/inpush1c.in
index 5373832d..5373832d 100644
--- a/test/cases/colm.d/inpush1c.in
+++ b/test/colm.d/inpush1c.in
diff --git a/test/cases/colm.d/island.lm b/test/colm.d/island.lm
index 85dab503..85dab503 100644
--- a/test/cases/colm.d/island.lm
+++ b/test/colm.d/island.lm
diff --git a/test/cases/colm.d/lhs1.lm b/test/colm.d/lhs1.lm
index c6afbad7..c6afbad7 100644
--- a/test/cases/colm.d/lhs1.lm
+++ b/test/colm.d/lhs1.lm
diff --git a/test/cases/colm.d/liftattrs.lm b/test/colm.d/liftattrs.lm
index c94aaebf..c94aaebf 100644
--- a/test/cases/colm.d/liftattrs.lm
+++ b/test/colm.d/liftattrs.lm
diff --git a/test/cases/colm.d/list1.lm b/test/colm.d/list1.lm
index 8639556e..8639556e 100644
--- a/test/cases/colm.d/list1.lm
+++ b/test/colm.d/list1.lm
diff --git a/test/cases/colm.d/list2.lm b/test/colm.d/list2.lm
index 9f5a12cd..9f5a12cd 100644
--- a/test/cases/colm.d/list2.lm
+++ b/test/colm.d/list2.lm
diff --git a/test/cases/colm.d/list3.lm b/test/colm.d/list3.lm
index 4284fd95..4284fd95 100644
--- a/test/cases/colm.d/list3.lm
+++ b/test/colm.d/list3.lm
diff --git a/test/cases/colm.d/list4.lm b/test/colm.d/list4.lm
index 76a79535..76a79535 100644
--- a/test/cases/colm.d/list4.lm
+++ b/test/colm.d/list4.lm
diff --git a/test/cases/colm.d/literal1.lm b/test/colm.d/literal1.lm
index 6f8711f3..6f8711f3 100644
--- a/test/cases/colm.d/literal1.lm
+++ b/test/colm.d/literal1.lm
diff --git a/test/cases/colm.d/load1.lm b/test/colm.d/load1.lm
index 71a10177..71a10177 100644
--- a/test/cases/colm.d/load1.lm
+++ b/test/colm.d/load1.lm
diff --git a/test/cases/colm.d/logical1.lm b/test/colm.d/logical1.lm
index b3f29be7..b3f29be7 100644
--- a/test/cases/colm.d/logical1.lm
+++ b/test/colm.d/logical1.lm
diff --git a/test/cases/colm.d/lookup1.lm b/test/colm.d/lookup1.lm
index 0c4cbbcf..0c4cbbcf 100644
--- a/test/cases/colm.d/lookup1.lm
+++ b/test/colm.d/lookup1.lm
diff --git a/test/cases/colm.d/mailbox.lm b/test/colm.d/mailbox.lm
index e510700d..e510700d 100644
--- a/test/cases/colm.d/mailbox.lm
+++ b/test/colm.d/mailbox.lm
diff --git a/test/cases/colm.d/maketree1.lm b/test/colm.d/maketree1.lm
index ccbcddd5..ccbcddd5 100644
--- a/test/cases/colm.d/maketree1.lm
+++ b/test/colm.d/maketree1.lm
diff --git a/test/cases/colm.d/map1.lm b/test/colm.d/map1.lm
index 65c4f595..65c4f595 100644
--- a/test/cases/colm.d/map1.lm
+++ b/test/colm.d/map1.lm
diff --git a/test/cases/colm.d/map2.lm b/test/colm.d/map2.lm
index 8fec8c83..8fec8c83 100644
--- a/test/cases/colm.d/map2.lm
+++ b/test/colm.d/map2.lm
diff --git a/test/cases/colm.d/map3.lm b/test/colm.d/map3.lm
index ca6ff3d4..ca6ff3d4 100644
--- a/test/cases/colm.d/map3.lm
+++ b/test/colm.d/map3.lm
diff --git a/test/cases/colm.d/map4.lm b/test/colm.d/map4.lm
index 0327b4d2..0327b4d2 100644
--- a/test/cases/colm.d/map4.lm
+++ b/test/colm.d/map4.lm
diff --git a/test/cases/colm.d/map5.lm b/test/colm.d/map5.lm
index fd26aa72..fd26aa72 100644
--- a/test/cases/colm.d/map5.lm
+++ b/test/colm.d/map5.lm
diff --git a/test/cases/colm.d/map6.lm b/test/colm.d/map6.lm
index 7261256e..7261256e 100644
--- a/test/cases/colm.d/map6.lm
+++ b/test/colm.d/map6.lm
diff --git a/test/cases/colm.d/matchex.lm b/test/colm.d/matchex.lm
index 3a76f83d..3a76f83d 100644
--- a/test/cases/colm.d/matchex.lm
+++ b/test/colm.d/matchex.lm
diff --git a/test/cases/colm.d/maxlen.lm b/test/colm.d/maxlen.lm
index 29dc92d9..29dc92d9 100644
--- a/test/cases/colm.d/maxlen.lm
+++ b/test/colm.d/maxlen.lm
diff --git a/test/cases/colm.d/mediawiki/.gitignore b/test/colm.d/mediawiki/.gitignore
index 91ad7cb0..91ad7cb0 100644
--- a/test/cases/colm.d/mediawiki/.gitignore
+++ b/test/colm.d/mediawiki/.gitignore
diff --git a/test/cases/colm.d/mediawiki/Makefile b/test/colm.d/mediawiki/Makefile
index d06acb2e..d06acb2e 100644
--- a/test/cases/colm.d/mediawiki/Makefile
+++ b/test/colm.d/mediawiki/Makefile
diff --git a/test/cases/colm.d/mediawiki/garticle.rl b/test/colm.d/mediawiki/garticle.rl
index cc101364..cc101364 100644
--- a/test/cases/colm.d/mediawiki/garticle.rl
+++ b/test/colm.d/mediawiki/garticle.rl
diff --git a/test/cases/colm.d/mediawiki/pdump.rl b/test/colm.d/mediawiki/pdump.rl
index 8b19bf37..8b19bf37 100644
--- a/test/cases/colm.d/mediawiki/pdump.rl
+++ b/test/colm.d/mediawiki/pdump.rl
diff --git a/test/cases/colm.d/multiregion1.lm b/test/colm.d/multiregion1.lm
index 825b0bbd..825b0bbd 100644
--- a/test/cases/colm.d/multiregion1.lm
+++ b/test/colm.d/multiregion1.lm
diff --git a/test/cases/colm.d/multiregion2.lm b/test/colm.d/multiregion2.lm
index f158c22e..f158c22e 100644
--- a/test/cases/colm.d/multiregion2.lm
+++ b/test/colm.d/multiregion2.lm
diff --git a/test/cases/colm.d/mutualrec.lm b/test/colm.d/mutualrec.lm
index 545b422c..545b422c 100644
--- a/test/cases/colm.d/mutualrec.lm
+++ b/test/colm.d/mutualrec.lm
diff --git a/test/cases/colm.d/namespace1.lm b/test/colm.d/namespace1.lm
index 61d1cd97..61d1cd97 100644
--- a/test/cases/colm.d/namespace1.lm
+++ b/test/colm.d/namespace1.lm
diff --git a/test/cases/colm.d/nestedcomm.lm b/test/colm.d/nestedcomm.lm
index bfca7610..bfca7610 100644
--- a/test/cases/colm.d/nestedcomm.lm
+++ b/test/colm.d/nestedcomm.lm
diff --git a/test/cases/colm.d/new1.lm b/test/colm.d/new1.lm
index 9d48679f..9d48679f 100644
--- a/test/cases/colm.d/new1.lm
+++ b/test/colm.d/new1.lm
diff --git a/test/cases/colm.d/open1.lm b/test/colm.d/open1.lm
index 70d32c3a..70d32c3a 100644
--- a/test/cases/colm.d/open1.lm
+++ b/test/colm.d/open1.lm
diff --git a/test/cases/colm.d/open2.lm b/test/colm.d/open2.lm
index 5230e8bc..5230e8bc 100644
--- a/test/cases/colm.d/open2.lm
+++ b/test/colm.d/open2.lm
diff --git a/test/cases/colm.d/order1.lm b/test/colm.d/order1.lm
index 29881e28..29881e28 100644
--- a/test/cases/colm.d/order1.lm
+++ b/test/colm.d/order1.lm
diff --git a/test/cases/colm.d/order2.lm b/test/colm.d/order2.lm
index 3eee1a7c..3eee1a7c 100644
--- a/test/cases/colm.d/order2.lm
+++ b/test/colm.d/order2.lm
diff --git a/test/cases/colm.d/parse1.lm b/test/colm.d/parse1.lm
index bbabe944..bbabe944 100644
--- a/test/cases/colm.d/parse1.lm
+++ b/test/colm.d/parse1.lm
diff --git a/test/cases/colm.d/parsetree1.lm b/test/colm.d/parsetree1.lm
index ed9c7bbf..ed9c7bbf 100644
--- a/test/cases/colm.d/parsetree1.lm
+++ b/test/colm.d/parsetree1.lm
diff --git a/test/cases/colm.d/pointer1.lm b/test/colm.d/pointer1.lm
index 3bde73ac..3bde73ac 100644
--- a/test/cases/colm.d/pointer1.lm
+++ b/test/colm.d/pointer1.lm
diff --git a/test/cases/colm.d/postfix.lm b/test/colm.d/postfix.lm
index 0e509e99..0e509e99 100644
--- a/test/cases/colm.d/postfix.lm
+++ b/test/colm.d/postfix.lm
diff --git a/test/cases/colm.d/print1.lm b/test/colm.d/print1.lm
index be3efd15..be3efd15 100644
--- a/test/cases/colm.d/print1.lm
+++ b/test/colm.d/print1.lm
diff --git a/test/cases/colm.d/prints.lm b/test/colm.d/prints.lm
index c4a38ca7..c4a38ca7 100644
--- a/test/cases/colm.d/prints.lm
+++ b/test/colm.d/prints.lm
diff --git a/test/cases/colm.d/pull1.lm b/test/colm.d/pull1.lm
index e3eb274a..e3eb274a 100644
--- a/test/cases/colm.d/pull1.lm
+++ b/test/colm.d/pull1.lm
diff --git a/test/cases/colm.d/pull2.lm b/test/colm.d/pull2.lm
index e166ef86..e166ef86 100644
--- a/test/cases/colm.d/pull2.lm
+++ b/test/colm.d/pull2.lm
diff --git a/test/cases/colm.d/pushloc.lm b/test/colm.d/pushloc.lm
index 6dd86326..6dd86326 100644
--- a/test/cases/colm.d/pushloc.lm
+++ b/test/colm.d/pushloc.lm
diff --git a/test/cases/colm.d/ragelambig1.lm b/test/colm.d/ragelambig1.lm
index 1e98bcf6..1e98bcf6 100644
--- a/test/cases/colm.d/ragelambig1.lm
+++ b/test/colm.d/ragelambig1.lm
diff --git a/test/cases/colm.d/ragelambig2.lm b/test/colm.d/ragelambig2.lm
index d549b5b9..d549b5b9 100644
--- a/test/cases/colm.d/ragelambig2.lm
+++ b/test/colm.d/ragelambig2.lm
diff --git a/test/cases/colm.d/ragelambig3.lm b/test/colm.d/ragelambig3.lm
index 9a87cf89..9a87cf89 100644
--- a/test/cases/colm.d/ragelambig3.lm
+++ b/test/colm.d/ragelambig3.lm
diff --git a/test/cases/colm.d/ragelambig4.lm b/test/colm.d/ragelambig4.lm
index 65bd4fd9..65bd4fd9 100644
--- a/test/cases/colm.d/ragelambig4.lm
+++ b/test/colm.d/ragelambig4.lm
diff --git a/test/cases/colm.d/rediv.lm b/test/colm.d/rediv.lm
index cf441f80..cf441f80 100644
--- a/test/cases/colm.d/rediv.lm
+++ b/test/colm.d/rediv.lm
diff --git a/test/cases/colm.d/ref1.lm b/test/colm.d/ref1.lm
index 9014ef6c..9014ef6c 100644
--- a/test/cases/colm.d/ref1.lm
+++ b/test/colm.d/ref1.lm
diff --git a/test/cases/colm.d/ref2.lm b/test/colm.d/ref2.lm
index 50fdf7a3..50fdf7a3 100644
--- a/test/cases/colm.d/ref2.lm
+++ b/test/colm.d/ref2.lm
diff --git a/test/cases/colm.d/ref3.lm b/test/colm.d/ref3.lm
index 47b84e3c..47b84e3c 100644
--- a/test/cases/colm.d/ref3.lm
+++ b/test/colm.d/ref3.lm
diff --git a/test/cases/colm.d/reor1.lm b/test/colm.d/reor1.lm
index 4bf34d18..4bf34d18 100644
--- a/test/cases/colm.d/reor1.lm
+++ b/test/colm.d/reor1.lm
diff --git a/test/cases/colm.d/reor2.lm b/test/colm.d/reor2.lm
index 2cba2f66..2cba2f66 100644
--- a/test/cases/colm.d/reor2.lm
+++ b/test/colm.d/reor2.lm
diff --git a/test/cases/colm.d/reparse.lm b/test/colm.d/reparse.lm
index 8955358a..8955358a 100644
--- a/test/cases/colm.d/reparse.lm
+++ b/test/colm.d/reparse.lm
diff --git a/test/cases/colm.d/repeat1.lm b/test/colm.d/repeat1.lm
index 9c907ff6..9c907ff6 100644
--- a/test/cases/colm.d/repeat1.lm
+++ b/test/colm.d/repeat1.lm
diff --git a/test/cases/colm.d/repeat2.lm b/test/colm.d/repeat2.lm
index edd8ec92..edd8ec92 100644
--- a/test/cases/colm.d/repeat2.lm
+++ b/test/colm.d/repeat2.lm
diff --git a/test/cases/colm.d/rhsref1.lm b/test/colm.d/rhsref1.lm
index 13a2fdab..13a2fdab 100644
--- a/test/cases/colm.d/rhsref1.lm
+++ b/test/colm.d/rhsref1.lm
diff --git a/test/cases/colm.d/rhsref2.lm b/test/colm.d/rhsref2.lm
index 621aea6b..621aea6b 100644
--- a/test/cases/colm.d/rhsref2.lm
+++ b/test/colm.d/rhsref2.lm
diff --git a/test/cases/colm.d/rubyhere.lm b/test/colm.d/rubyhere.lm
index c36f4d3b..c36f4d3b 100644
--- a/test/cases/colm.d/rubyhere.lm
+++ b/test/colm.d/rubyhere.lm
diff --git a/test/cases/colm.d/scope1.lm b/test/colm.d/scope1.lm
index d2523ff8..d2523ff8 100644
--- a/test/cases/colm.d/scope1.lm
+++ b/test/colm.d/scope1.lm
diff --git a/test/cases/colm.d/sedsubst b/test/colm.d/sedsubst
index da01055e..da01055e 100755
--- a/test/cases/colm.d/sedsubst
+++ b/test/colm.d/sedsubst
diff --git a/test/cases/colm.d/send1.lm b/test/colm.d/send1.lm
index 51adfc81..51adfc81 100644
--- a/test/cases/colm.d/send1.lm
+++ b/test/colm.d/send1.lm
diff --git a/test/cases/colm.d/sendstream.lm b/test/colm.d/sendstream.lm
index 50edeae6..50edeae6 100644
--- a/test/cases/colm.d/sendstream.lm
+++ b/test/colm.d/sendstream.lm
diff --git a/test/cases/colm.d/sprintf.lm b/test/colm.d/sprintf.lm
index 41eefbb9..41eefbb9 100644
--- a/test/cases/colm.d/sprintf.lm
+++ b/test/colm.d/sprintf.lm
diff --git a/test/cases/colm.d/stds1.lm b/test/colm.d/stds1.lm
index 64ba0f72..64ba0f72 100644
--- a/test/cases/colm.d/stds1.lm
+++ b/test/colm.d/stds1.lm
diff --git a/test/cases/colm.d/streamseq1.lm b/test/colm.d/streamseq1.lm
index 57b8659d..57b8659d 100644
--- a/test/cases/colm.d/streamseq1.lm
+++ b/test/colm.d/streamseq1.lm
diff --git a/test/cases/colm.d/streamseq1a.in b/test/colm.d/streamseq1a.in
index 112117a9..112117a9 100644
--- a/test/cases/colm.d/streamseq1a.in
+++ b/test/colm.d/streamseq1a.in
diff --git a/test/cases/colm.d/streamseq1b.in b/test/colm.d/streamseq1b.in
index 75a47fa8..75a47fa8 100644
--- a/test/cases/colm.d/streamseq1b.in
+++ b/test/colm.d/streamseq1b.in
diff --git a/test/cases/colm.d/streamseq1c.in b/test/colm.d/streamseq1c.in
index a7d14bef..a7d14bef 100644
--- a/test/cases/colm.d/streamseq1c.in
+++ b/test/colm.d/streamseq1c.in
diff --git a/test/cases/colm.d/streamseq2.lm b/test/colm.d/streamseq2.lm
index 180bdd16..180bdd16 100644
--- a/test/cases/colm.d/streamseq2.lm
+++ b/test/colm.d/streamseq2.lm
diff --git a/test/cases/colm.d/string.lm b/test/colm.d/string.lm
index c5e79270..c5e79270 100644
--- a/test/cases/colm.d/string.lm
+++ b/test/colm.d/string.lm
diff --git a/test/cases/colm.d/struct1.lm b/test/colm.d/struct1.lm
index e8323ede..e8323ede 100644
--- a/test/cases/colm.d/struct1.lm
+++ b/test/colm.d/struct1.lm
diff --git a/test/cases/colm.d/subject.mk.in b/test/colm.d/subject.mk.in
index 79e17d63..79e17d63 100644
--- a/test/cases/colm.d/subject.mk.in
+++ b/test/colm.d/subject.mk.in
diff --git a/test/cases/colm.d/subject.pl.in b/test/colm.d/subject.pl.in
index d2698901..d2698901 100644
--- a/test/cases/colm.d/subject.pl.in
+++ b/test/colm.d/subject.pl.in
diff --git a/test/cases/colm.d/subject.sh.in b/test/colm.d/subject.sh.in
index 718a297a..718a297a 100644
--- a/test/cases/colm.d/subject.sh.in
+++ b/test/colm.d/subject.sh.in
diff --git a/test/cases/colm.d/superid.lm b/test/colm.d/superid.lm
index abd36c3f..abd36c3f 100644
--- a/test/cases/colm.d/superid.lm
+++ b/test/colm.d/superid.lm
diff --git a/test/cases/colm.d/switch1.lm b/test/colm.d/switch1.lm
index 1d625311..1d625311 100644
--- a/test/cases/colm.d/switch1.lm
+++ b/test/colm.d/switch1.lm
diff --git a/test/cases/colm.d/switch2.lm b/test/colm.d/switch2.lm
index 52d90e0e..52d90e0e 100644
--- a/test/cases/colm.d/switch2.lm
+++ b/test/colm.d/switch2.lm
diff --git a/test/cases/colm.d/tags1.lm b/test/colm.d/tags1.lm
index dcc0498b..dcc0498b 100644
--- a/test/cases/colm.d/tags1.lm
+++ b/test/colm.d/tags1.lm
diff --git a/test/cases/colm.d/tags2.lm b/test/colm.d/tags2.lm
index 448aafe0..448aafe0 100644
--- a/test/cases/colm.d/tags2.lm
+++ b/test/colm.d/tags2.lm
diff --git a/test/cases/colm.d/tags3.lm b/test/colm.d/tags3.lm
index 6955d60c..6955d60c 100644
--- a/test/cases/colm.d/tags3.lm
+++ b/test/colm.d/tags3.lm
diff --git a/test/cases/colm.d/tags4.lm b/test/colm.d/tags4.lm
index 1d4468e4..1d4468e4 100644
--- a/test/cases/colm.d/tags4.lm
+++ b/test/colm.d/tags4.lm
diff --git a/test/cases/colm.d/tcontext1.lm b/test/colm.d/tcontext1.lm
index 55b8a323..55b8a323 100644
--- a/test/cases/colm.d/tcontext1.lm
+++ b/test/colm.d/tcontext1.lm
diff --git a/test/cases/colm.d/til.lm b/test/colm.d/til.lm
index 2fec045e..2fec045e 100644
--- a/test/cases/colm.d/til.lm
+++ b/test/colm.d/til.lm
diff --git a/test/cases/colm.d/translate1.lm b/test/colm.d/translate1.lm
index 48438d5a..48438d5a 100644
--- a/test/cases/colm.d/translate1.lm
+++ b/test/colm.d/translate1.lm
diff --git a/test/cases/colm.d/translate2.lm b/test/colm.d/translate2.lm
index 4e49b301..4e49b301 100644
--- a/test/cases/colm.d/translate2.lm
+++ b/test/colm.d/translate2.lm
diff --git a/test/cases/colm.d/travs1.lm b/test/colm.d/travs1.lm
index 8277e32f..8277e32f 100644
--- a/test/cases/colm.d/travs1.lm
+++ b/test/colm.d/travs1.lm
diff --git a/test/cases/colm.d/travs2.in b/test/colm.d/travs2.in
index 81d197f3..81d197f3 100644
--- a/test/cases/colm.d/travs2.in
+++ b/test/colm.d/travs2.in
diff --git a/test/cases/colm.d/treecmp1.lm b/test/colm.d/treecmp1.lm
index c9666393..c9666393 100644
--- a/test/cases/colm.d/treecmp1.lm
+++ b/test/colm.d/treecmp1.lm
diff --git a/test/cases/colm.d/typeref1.lm b/test/colm.d/typeref1.lm
index d6368549..d6368549 100644
--- a/test/cases/colm.d/typeref1.lm
+++ b/test/colm.d/typeref1.lm
diff --git a/test/cases/colm.d/typeref2.lm b/test/colm.d/typeref2.lm
index 49d03b62..49d03b62 100644
--- a/test/cases/colm.d/typeref2.lm
+++ b/test/colm.d/typeref2.lm
diff --git a/test/cases/colm.d/typeref3.lm b/test/colm.d/typeref3.lm
index 5cec7508..5cec7508 100644
--- a/test/cases/colm.d/typeref3.lm
+++ b/test/colm.d/typeref3.lm
diff --git a/test/cases/colm.d/undofrag1.lm b/test/colm.d/undofrag1.lm
index 5fbe7df6..5fbe7df6 100644
--- a/test/cases/colm.d/undofrag1.lm
+++ b/test/colm.d/undofrag1.lm
diff --git a/test/cases/colm.d/undofrag2.lm b/test/colm.d/undofrag2.lm
index f654f121..f654f121 100644
--- a/test/cases/colm.d/undofrag2.lm
+++ b/test/colm.d/undofrag2.lm
diff --git a/test/cases/colm.d/undofrag3.lm b/test/colm.d/undofrag3.lm
index 47ca7973..47ca7973 100644
--- a/test/cases/colm.d/undofrag3.lm
+++ b/test/colm.d/undofrag3.lm
diff --git a/test/cases/colm.d/undolist1.lm b/test/colm.d/undolist1.lm
index b65d7780..b65d7780 100644
--- a/test/cases/colm.d/undolist1.lm
+++ b/test/colm.d/undolist1.lm
diff --git a/test/cases/colm.d/undomap1.lm b/test/colm.d/undomap1.lm
index df2a648a..df2a648a 100644
--- a/test/cases/colm.d/undomap1.lm
+++ b/test/colm.d/undomap1.lm
diff --git a/test/cases/colm.d/undomap2.lm b/test/colm.d/undomap2.lm
index 25ae6205..25ae6205 100644
--- a/test/cases/colm.d/undomap2.lm
+++ b/test/colm.d/undomap2.lm
diff --git a/test/cases/colm.d/utf8.lm b/test/colm.d/utf8.lm
index 3ff06ff5..3ff06ff5 100644
--- a/test/cases/colm.d/utf8.lm
+++ b/test/colm.d/utf8.lm
diff --git a/test/cases/colm.d/void1.lm b/test/colm.d/void1.lm
index ede542da..ede542da 100644
--- a/test/cases/colm.d/void1.lm
+++ b/test/colm.d/void1.lm
diff --git a/test/cases/colm.d/while1.lm b/test/colm.d/while1.lm
index c963f096..c963f096 100644
--- a/test/cases/colm.d/while1.lm
+++ b/test/colm.d/while1.lm
diff --git a/test/cases/colm.d/xmlac.lm b/test/colm.d/xmlac.lm
index 72e42624..72e42624 100644
--- a/test/cases/colm.d/xmlac.lm
+++ b/test/colm.d/xmlac.lm
diff --git a/test/cases/ragel.d/.gitignore b/test/ragel.d/.gitignore
index 1348c892..ee2d6d6e 100644
--- a/test/cases/ragel.d/.gitignore
+++ b/test/ragel.d/.gitignore
@@ -31,4 +31,4 @@
 /subject.mk
 /subject.sh
 
-/pcre.d
+/.libs
diff --git a/test/cases/ragel.d/Makefile.am b/test/ragel.d/Makefile.am
index 5cb7a5f8..2a230c6b 100644
--- a/test/cases/ragel.d/Makefile.am
+++ b/test/ragel.d/Makefile.am
@@ -18,8 +18,12 @@
 #   along with Ragel; if not, write to the Free Software
 #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
-COLM = @COLM_BIN@
-RAGEL_LM = @RAGEL_LM@
+COLM = ../../colm/colm
+RAGEL_LM = ../../ragel
+SED_SUBST = 's/@NO_EFFECT@//'
+
+COLM_CPPFLAGS = -I../../colm/include
+COLM_LDFLAGS = -L../../colm
 
 TESTS = gentests
 
@@ -54,19 +58,19 @@ TRANS_DEPS = \
 	trans-ocaml.lm trans-ruby.lm \
 	trans-rust.lm
 
-trans_CPPFLAGS = @COLM_CPPFLAGS@
+trans_CPPFLAGS = $(COLM_CPPFLAGS)
 trans_SOURCES = trans.c main.c
 trans_LDADD = -lcolm
-trans_LDFLAGS = @COLM_LDFLAGS@
+trans_LDFLAGS = $(COLM_LDFLAGS)
 
 trans.c: trans.lm $(TRANS_DEPS)
-	$(COLM) -c -b trans_object -I$(RAGEL_LM) -o $@ $<
+	$(COLM) -c -b trans_object -I$(RAGEL_LM) -I../../ragel/host-go -o $@ $<
 
 gentests: gentests.sh Makefile
-	@$(top_srcdir)/sedsubst $< $@ -w,+x $(SED_SUBST)
+	@$(top_srcdir)/test/sedsubst $< $@ -w,+x $(SED_SUBST)
 
 subject.mk: subject.mk.in Makefile
-	@$(top_srcdir)/sedsubst $< $@ -w,+x $(SED_SUBST)
+	@$(top_srcdir)/test/sedsubst $< $@ -w,+x $(SED_SUBST)
 
 subject.sh: subject.sh.in Makefile
-	@$(top_srcdir)/sedsubst $< $@ -w,+x $(SED_SUBST)
+	@$(top_srcdir)/test/sedsubst $< $@ -w,+x $(SED_SUBST)
diff --git a/test/cases/ragel.d/README b/test/ragel.d/README
index afebb52f..afebb52f 100644
--- a/test/cases/ragel.d/README
+++ b/test/ragel.d/README
diff --git a/test/cases/ragel.d/any1.rl b/test/ragel.d/any1.rl
index 81ec713c..81ec713c 100644
--- a/test/cases/ragel.d/any1.rl
+++ b/test/ragel.d/any1.rl
diff --git a/test/cases/ragel.d/args1.rl b/test/ragel.d/args1.rl
index e4f8332d..e4f8332d 100644
--- a/test/cases/ragel.d/args1.rl
+++ b/test/ragel.d/args1.rl
diff --git a/test/cases/ragel.d/args2.rl b/test/ragel.d/args2.rl
index 5d55349e..5d55349e 100644
--- a/test/cases/ragel.d/args2.rl
+++ b/test/ragel.d/args2.rl
diff --git a/test/cases/ragel.d/argsinc.rl b/test/ragel.d/argsinc.rl
index 2617fdde..2617fdde 100644
--- a/test/cases/ragel.d/argsinc.rl
+++ b/test/ragel.d/argsinc.rl
diff --git a/test/cases/ragel.d/atoi1.rl b/test/ragel.d/atoi1.rl
index 40217d91..40217d91 100644
--- a/test/cases/ragel.d/atoi1.rl
+++ b/test/ragel.d/atoi1.rl
diff --git a/test/cases/ragel.d/atoi2.rl b/test/ragel.d/atoi2.rl
index d793d3d8..d793d3d8 100644
--- a/test/cases/ragel.d/atoi2.rl
+++ b/test/ragel.d/atoi2.rl
diff --git a/test/cases/ragel.d/atoi3.rl b/test/ragel.d/atoi3.rl
index cb919287..cb919287 100644
--- a/test/cases/ragel.d/atoi3.rl
+++ b/test/ragel.d/atoi3.rl
diff --git a/test/cases/ragel.d/atoi4.rl b/test/ragel.d/atoi4.rl
index 04b678f9..04b678f9 100644
--- a/test/cases/ragel.d/atoi4.rl
+++ b/test/ragel.d/atoi4.rl
diff --git a/test/cases/ragel.d/atoi5.rl b/test/ragel.d/atoi5.rl
index c2928967..c2928967 100644
--- a/test/cases/ragel.d/atoi5.rl
+++ b/test/ragel.d/atoi5.rl
diff --git a/test/cases/ragel.d/awkemu.rl b/test/ragel.d/awkemu.rl
index 201559d6..201559d6 100644
--- a/test/cases/ragel.d/awkemu.rl
+++ b/test/ragel.d/awkemu.rl
diff --git a/test/cases/ragel.d/buffer.h b/test/ragel.d/buffer.h
index 60ef1242..60ef1242 100644
--- a/test/cases/ragel.d/buffer.h
+++ b/test/ragel.d/buffer.h
diff --git a/test/cases/ragel.d/builtin.rl b/test/ragel.d/builtin.rl
index eb8f27c3..eb8f27c3 100644
--- a/test/cases/ragel.d/builtin.rl
+++ b/test/ragel.d/builtin.rl
diff --git a/test/cases/ragel.d/call1.rl b/test/ragel.d/call1.rl
index 3b54a713..3b54a713 100644
--- a/test/cases/ragel.d/call1.rl
+++ b/test/ragel.d/call1.rl
diff --git a/test/cases/ragel.d/call2.rl b/test/ragel.d/call2.rl
index fdf40e6f..fdf40e6f 100644
--- a/test/cases/ragel.d/call2.rl
+++ b/test/ragel.d/call2.rl
diff --git a/test/cases/ragel.d/call3.rl b/test/ragel.d/call3.rl
index 416790d8..416790d8 100644
--- a/test/cases/ragel.d/call3.rl
+++ b/test/ragel.d/call3.rl
diff --git a/test/cases/ragel.d/call4.rl b/test/ragel.d/call4.rl
index a999d490..a999d490 100644
--- a/test/cases/ragel.d/call4.rl
+++ b/test/ragel.d/call4.rl
diff --git a/test/cases/ragel.d/caseindep.rl b/test/ragel.d/caseindep.rl
index d3bd188c..d3bd188c 100644
--- a/test/cases/ragel.d/caseindep.rl
+++ b/test/ragel.d/caseindep.rl
diff --git a/test/cases/ragel.d/clang1.rl b/test/ragel.d/clang1.rl
index b5610331..b5610331 100644
--- a/test/cases/ragel.d/clang1.rl
+++ b/test/ragel.d/clang1.rl
diff --git a/test/cases/ragel.d/clang2.rl b/test/ragel.d/clang2.rl
index fead806e..fead806e 100644
--- a/test/cases/ragel.d/clang2.rl
+++ b/test/ragel.d/clang2.rl
diff --git a/test/cases/ragel.d/clang3.rl b/test/ragel.d/clang3.rl
index a3c162fa..a3c162fa 100644
--- a/test/cases/ragel.d/clang3.rl
+++ b/test/ragel.d/clang3.rl
diff --git a/test/cases/ragel.d/clang4.rl b/test/ragel.d/clang4.rl
index b033a479..b033a479 100644
--- a/test/cases/ragel.d/clang4.rl
+++ b/test/ragel.d/clang4.rl
diff --git a/test/cases/ragel.d/clang5.rl b/test/ragel.d/clang5.rl
index c4633c09..c4633c09 100644
--- a/test/cases/ragel.d/clang5.rl
+++ b/test/ragel.d/clang5.rl
diff --git a/test/cases/ragel.d/cond1.rl b/test/ragel.d/cond1.rl
index 58a31dca..58a31dca 100644
--- a/test/cases/ragel.d/cond1.rl
+++ b/test/ragel.d/cond1.rl
diff --git a/test/cases/ragel.d/cond10.rl b/test/ragel.d/cond10.rl
index 50b50d28..50b50d28 100644
--- a/test/cases/ragel.d/cond10.rl
+++ b/test/ragel.d/cond10.rl
diff --git a/test/cases/ragel.d/cond11.rl b/test/ragel.d/cond11.rl
index be63e63c..be63e63c 100644
--- a/test/cases/ragel.d/cond11.rl
+++ b/test/ragel.d/cond11.rl
diff --git a/test/cases/ragel.d/cond2.rl b/test/ragel.d/cond2.rl
index 507522b5..507522b5 100644
--- a/test/cases/ragel.d/cond2.rl
+++ b/test/ragel.d/cond2.rl
diff --git a/test/cases/ragel.d/cond3.rl b/test/ragel.d/cond3.rl
index d08b0d75..d08b0d75 100644
--- a/test/cases/ragel.d/cond3.rl
+++ b/test/ragel.d/cond3.rl
diff --git a/test/cases/ragel.d/cond4.rl b/test/ragel.d/cond4.rl
index a110bee8..a110bee8 100644
--- a/test/cases/ragel.d/cond4.rl
+++ b/test/ragel.d/cond4.rl
diff --git a/test/cases/ragel.d/cond5.rl b/test/ragel.d/cond5.rl
index db7afea6..db7afea6 100644
--- a/test/cases/ragel.d/cond5.rl
+++ b/test/ragel.d/cond5.rl
diff --git a/test/cases/ragel.d/cond6.rl b/test/ragel.d/cond6.rl
index 4d66956f..4d66956f 100644
--- a/test/cases/ragel.d/cond6.rl
+++ b/test/ragel.d/cond6.rl
diff --git a/test/cases/ragel.d/cond7.rl b/test/ragel.d/cond7.rl
index 2fb66b4b..2fb66b4b 100644
--- a/test/cases/ragel.d/cond7.rl
+++ b/test/ragel.d/cond7.rl
diff --git a/test/cases/ragel.d/cond8.rl b/test/ragel.d/cond8.rl
index bb7e0939..bb7e0939 100644
--- a/test/cases/ragel.d/cond8.rl
+++ b/test/ragel.d/cond8.rl
diff --git a/test/cases/ragel.d/cond9.rl b/test/ragel.d/cond9.rl
index b7fdf055..b7fdf055 100644
--- a/test/cases/ragel.d/cond9.rl
+++ b/test/ragel.d/cond9.rl
diff --git a/test/cases/ragel.d/conderr1.rl b/test/ragel.d/conderr1.rl
index 4e1288c0..4e1288c0 100644
--- a/test/cases/ragel.d/conderr1.rl
+++ b/test/ragel.d/conderr1.rl
diff --git a/test/cases/ragel.d/conderr2.rl b/test/ragel.d/conderr2.rl
index f62cb0f7..f62cb0f7 100644
--- a/test/cases/ragel.d/conderr2.rl
+++ b/test/ragel.d/conderr2.rl
diff --git a/test/cases/ragel.d/condrep1.rl b/test/ragel.d/condrep1.rl
index 10ae8949..10ae8949 100644
--- a/test/cases/ragel.d/condrep1.rl
+++ b/test/ragel.d/condrep1.rl
diff --git a/test/cases/ragel.d/condrep2.rl b/test/ragel.d/condrep2.rl
index e1b350dd..e1b350dd 100644
--- a/test/cases/ragel.d/condrep2.rl
+++ b/test/ragel.d/condrep2.rl
diff --git a/test/cases/ragel.d/condrep3.rl b/test/ragel.d/condrep3.rl
index df5f3f25..df5f3f25 100644
--- a/test/cases/ragel.d/condrep3.rl
+++ b/test/ragel.d/condrep3.rl
diff --git a/test/cases/ragel.d/condrep4.rl b/test/ragel.d/condrep4.rl
index 3a8bb85c..3a8bb85c 100644
--- a/test/cases/ragel.d/condrep4.rl
+++ b/test/ragel.d/condrep4.rl
diff --git a/test/cases/ragel.d/condrep5.rl b/test/ragel.d/condrep5.rl
index 7ccba667..7ccba667 100644
--- a/test/cases/ragel.d/condrep5.rl
+++ b/test/ragel.d/condrep5.rl
diff --git a/test/cases/ragel.d/cppscan1.h b/test/ragel.d/cppscan1.h
index 346dd9b6..346dd9b6 100644
--- a/test/cases/ragel.d/cppscan1.h
+++ b/test/ragel.d/cppscan1.h
diff --git a/test/cases/ragel.d/cppscan1.rl b/test/ragel.d/cppscan1.rl
index b523227e..b523227e 100644
--- a/test/cases/ragel.d/cppscan1.rl
+++ b/test/ragel.d/cppscan1.rl
diff --git a/test/cases/ragel.d/cppscan2.rl b/test/ragel.d/cppscan2.rl
index 0c29a792..0c29a792 100644
--- a/test/cases/ragel.d/cppscan2.rl
+++ b/test/ragel.d/cppscan2.rl
diff --git a/test/cases/ragel.d/cppscan3.rl b/test/ragel.d/cppscan3.rl
index 747d8512..747d8512 100644
--- a/test/cases/ragel.d/cppscan3.rl
+++ b/test/ragel.d/cppscan3.rl
diff --git a/test/cases/ragel.d/cppscan4.rl b/test/ragel.d/cppscan4.rl
index 9fb2f10c..9fb2f10c 100644
--- a/test/cases/ragel.d/cppscan4.rl
+++ b/test/ragel.d/cppscan4.rl
diff --git a/test/cases/ragel.d/cppscan5.rl b/test/ragel.d/cppscan5.rl
index e4244129..e4244129 100644
--- a/test/cases/ragel.d/cppscan5.rl
+++ b/test/ragel.d/cppscan5.rl
diff --git a/test/cases/ragel.d/cppscan6.rl b/test/ragel.d/cppscan6.rl
index 3952733b..3952733b 100644
--- a/test/cases/ragel.d/cppscan6.rl
+++ b/test/ragel.d/cppscan6.rl
diff --git a/test/cases/ragel.d/crack1.rl b/test/ragel.d/crack1.rl
index 2154416d..2154416d 100644
--- a/test/cases/ragel.d/crack1.rl
+++ b/test/ragel.d/crack1.rl
diff --git a/test/cases/ragel.d/curs1.rl b/test/ragel.d/curs1.rl
index 71c5c43c..71c5c43c 100644
--- a/test/cases/ragel.d/curs1.rl
+++ b/test/ragel.d/curs1.rl
diff --git a/test/cases/ragel.d/element1.rl b/test/ragel.d/element1.rl
index 5150ec17..5150ec17 100644
--- a/test/cases/ragel.d/element1.rl
+++ b/test/ragel.d/element1.rl
diff --git a/test/cases/ragel.d/element2.rl b/test/ragel.d/element2.rl
index ff129612..ff129612 100644
--- a/test/cases/ragel.d/element2.rl
+++ b/test/ragel.d/element2.rl
diff --git a/test/cases/ragel.d/element3.rl b/test/ragel.d/element3.rl
index a62db226..a62db226 100644
--- a/test/cases/ragel.d/element3.rl
+++ b/test/ragel.d/element3.rl
diff --git a/test/cases/ragel.d/empty1.rl b/test/ragel.d/empty1.rl
index 39078902..39078902 100644
--- a/test/cases/ragel.d/empty1.rl
+++ b/test/ragel.d/empty1.rl
diff --git a/test/cases/ragel.d/eofact.h b/test/ragel.d/eofact.h
index d547f87e..d547f87e 100644
--- a/test/cases/ragel.d/eofact.h
+++ b/test/ragel.d/eofact.h
diff --git a/test/cases/ragel.d/eofact.rl b/test/ragel.d/eofact.rl
index 83ad2a7e..83ad2a7e 100644
--- a/test/cases/ragel.d/eofact.rl
+++ b/test/ragel.d/eofact.rl
diff --git a/test/cases/ragel.d/eofcall1.rl b/test/ragel.d/eofcall1.rl
index 89175548..89175548 100644
--- a/test/cases/ragel.d/eofcall1.rl
+++ b/test/ragel.d/eofcall1.rl
diff --git a/test/cases/ragel.d/eofcall2.rl b/test/ragel.d/eofcall2.rl
index eabfac75..eabfac75 100644
--- a/test/cases/ragel.d/eofcall2.rl
+++ b/test/ragel.d/eofcall2.rl
diff --git a/test/cases/ragel.d/eofgoto1.rl b/test/ragel.d/eofgoto1.rl
index e253d0f7..e253d0f7 100644
--- a/test/cases/ragel.d/eofgoto1.rl
+++ b/test/ragel.d/eofgoto1.rl
diff --git a/test/cases/ragel.d/eofgoto2.rl b/test/ragel.d/eofgoto2.rl
index f42048d7..f42048d7 100644
--- a/test/cases/ragel.d/eofgoto2.rl
+++ b/test/ragel.d/eofgoto2.rl
diff --git a/test/cases/ragel.d/eofret1.rl b/test/ragel.d/eofret1.rl
index fc2b8cab..fc2b8cab 100644
--- a/test/cases/ragel.d/eofret1.rl
+++ b/test/ragel.d/eofret1.rl
diff --git a/test/cases/ragel.d/erract1.rl b/test/ragel.d/erract1.rl
index 65b9f27d..65b9f27d 100644
--- a/test/cases/ragel.d/erract1.rl
+++ b/test/ragel.d/erract1.rl
diff --git a/test/cases/ragel.d/erract2.rl b/test/ragel.d/erract2.rl
index f6007151..f6007151 100644
--- a/test/cases/ragel.d/erract2.rl
+++ b/test/ragel.d/erract2.rl
diff --git a/test/cases/ragel.d/erract3.rl b/test/ragel.d/erract3.rl
index 6de07dbb..6de07dbb 100644
--- a/test/cases/ragel.d/erract3.rl
+++ b/test/ragel.d/erract3.rl
diff --git a/test/cases/ragel.d/erract4.rl b/test/ragel.d/erract4.rl
index b6910d70..b6910d70 100644
--- a/test/cases/ragel.d/erract4.rl
+++ b/test/ragel.d/erract4.rl
diff --git a/test/cases/ragel.d/erract5.rl b/test/ragel.d/erract5.rl
index d9dca844..d9dca844 100644
--- a/test/cases/ragel.d/erract5.rl
+++ b/test/ragel.d/erract5.rl
diff --git a/test/cases/ragel.d/erract6.rl b/test/ragel.d/erract6.rl
index def2fcec..def2fcec 100644
--- a/test/cases/ragel.d/erract6.rl
+++ b/test/ragel.d/erract6.rl
diff --git a/test/cases/ragel.d/erract7.rl b/test/ragel.d/erract7.rl
index 2a101d26..2a101d26 100644
--- a/test/cases/ragel.d/erract7.rl
+++ b/test/ragel.d/erract7.rl
diff --git a/test/cases/ragel.d/erract8.rl b/test/ragel.d/erract8.rl
index 7d1f3f28..7d1f3f28 100644
--- a/test/cases/ragel.d/erract8.rl
+++ b/test/ragel.d/erract8.rl
diff --git a/test/cases/ragel.d/erract9.rl b/test/ragel.d/erract9.rl
index e95a2282..e95a2282 100644
--- a/test/cases/ragel.d/erract9.rl
+++ b/test/ragel.d/erract9.rl
diff --git a/test/cases/ragel.d/export1.rl b/test/ragel.d/export1.rl
index dbdb697f..dbdb697f 100644
--- a/test/cases/ragel.d/export1.rl
+++ b/test/ragel.d/export1.rl
diff --git a/test/cases/ragel.d/export2.rl b/test/ragel.d/export2.rl
index 886685de..886685de 100644
--- a/test/cases/ragel.d/export2.rl
+++ b/test/ragel.d/export2.rl
diff --git a/test/cases/ragel.d/export3.rl b/test/ragel.d/export3.rl
index fa5ab071..fa5ab071 100644
--- a/test/cases/ragel.d/export3.rl
+++ b/test/ragel.d/export3.rl
diff --git a/test/cases/ragel.d/export4.rl b/test/ragel.d/export4.rl
index 7600dd06..7600dd06 100644
--- a/test/cases/ragel.d/export4.rl
+++ b/test/ragel.d/export4.rl
diff --git a/test/cases/ragel.d/fnext1.rl b/test/ragel.d/fnext1.rl
index 631a29c7..631a29c7 100644
--- a/test/cases/ragel.d/fnext1.rl
+++ b/test/ragel.d/fnext1.rl
diff --git a/test/cases/ragel.d/fnext2.rl b/test/ragel.d/fnext2.rl
index 69bfee47..69bfee47 100644
--- a/test/cases/ragel.d/fnext2.rl
+++ b/test/ragel.d/fnext2.rl
diff --git a/test/cases/ragel.d/fnext3.rl b/test/ragel.d/fnext3.rl
index 69bfee47..69bfee47 100644
--- a/test/cases/ragel.d/fnext3.rl
+++ b/test/ragel.d/fnext3.rl
diff --git a/test/cases/ragel.d/forder1.rl b/test/ragel.d/forder1.rl
index a0139b87..a0139b87 100644
--- a/test/cases/ragel.d/forder1.rl
+++ b/test/ragel.d/forder1.rl
diff --git a/test/cases/ragel.d/forder2.rl b/test/ragel.d/forder2.rl
index f9e8ec00..f9e8ec00 100644
--- a/test/cases/ragel.d/forder2.rl
+++ b/test/ragel.d/forder2.rl
diff --git a/test/cases/ragel.d/forder3.rl b/test/ragel.d/forder3.rl
index 65eee519..65eee519 100644
--- a/test/cases/ragel.d/forder3.rl
+++ b/test/ragel.d/forder3.rl
diff --git a/test/cases/ragel.d/genrep1.rl b/test/ragel.d/genrep1.rl
index 69cc809a..69cc809a 100644
--- a/test/cases/ragel.d/genrep1.rl
+++ b/test/ragel.d/genrep1.rl
diff --git a/test/cases/ragel.d/genrep2.rl b/test/ragel.d/genrep2.rl
index e428ac51..e428ac51 100644
--- a/test/cases/ragel.d/genrep2.rl
+++ b/test/ragel.d/genrep2.rl
diff --git a/test/cases/ragel.d/genrep3.rl b/test/ragel.d/genrep3.rl
index c3940e1e..c3940e1e 100644
--- a/test/cases/ragel.d/genrep3.rl
+++ b/test/ragel.d/genrep3.rl
diff --git a/test/cases/ragel.d/genrep4.rl b/test/ragel.d/genrep4.rl
index 861de34f..861de34f 100644
--- a/test/cases/ragel.d/genrep4.rl
+++ b/test/ragel.d/genrep4.rl
diff --git a/test/cases/ragel.d/genrep5.rl b/test/ragel.d/genrep5.rl
index ebaf7e70..ebaf7e70 100644
--- a/test/cases/ragel.d/genrep5.rl
+++ b/test/ragel.d/genrep5.rl
diff --git a/test/cases/ragel.d/genrep6.rl b/test/ragel.d/genrep6.rl
index 26515b93..26515b93 100644
--- a/test/cases/ragel.d/genrep6.rl
+++ b/test/ragel.d/genrep6.rl
diff --git a/test/cases/ragel.d/genrep7.rl b/test/ragel.d/genrep7.rl
index a535e201..a535e201 100644
--- a/test/cases/ragel.d/genrep7.rl
+++ b/test/ragel.d/genrep7.rl
diff --git a/test/cases/ragel.d/genrep8.rl b/test/ragel.d/genrep8.rl
index 1e800e85..1e800e85 100644
--- a/test/cases/ragel.d/genrep8.rl
+++ b/test/ragel.d/genrep8.rl
diff --git a/test/cases/ragel.d/gentests.sh b/test/ragel.d/gentests.sh
index d27cd204..d27cd204 100644
--- a/test/cases/ragel.d/gentests.sh
+++ b/test/ragel.d/gentests.sh
diff --git a/test/cases/ragel.d/goto1.rl b/test/ragel.d/goto1.rl
index 0bf121f4..0bf121f4 100644
--- a/test/cases/ragel.d/goto1.rl
+++ b/test/ragel.d/goto1.rl
diff --git a/test/cases/ragel.d/gotocallret1.rl b/test/ragel.d/gotocallret1.rl
index 869349b6..869349b6 100644
--- a/test/cases/ragel.d/gotocallret1.rl
+++ b/test/ragel.d/gotocallret1.rl
diff --git a/test/cases/ragel.d/gotocallret2.rl b/test/ragel.d/gotocallret2.rl
index 7d4c6c50..7d4c6c50 100644
--- a/test/cases/ragel.d/gotocallret2.rl
+++ b/test/ragel.d/gotocallret2.rl
diff --git a/test/cases/ragel.d/gotocallret3.rl b/test/ragel.d/gotocallret3.rl
index 6878f70f..6878f70f 100644
--- a/test/cases/ragel.d/gotocallret3.rl
+++ b/test/ragel.d/gotocallret3.rl
diff --git a/test/cases/ragel.d/high1.rl b/test/ragel.d/high1.rl
index a901e19a..a901e19a 100644
--- a/test/cases/ragel.d/high1.rl
+++ b/test/ragel.d/high1.rl
diff --git a/test/cases/ragel.d/high2.rl b/test/ragel.d/high2.rl
index 457fdee8..457fdee8 100644
--- a/test/cases/ragel.d/high2.rl
+++ b/test/ragel.d/high2.rl
diff --git a/test/cases/ragel.d/high3.rl b/test/ragel.d/high3.rl
index 454da6a8..454da6a8 100644
--- a/test/cases/ragel.d/high3.rl
+++ b/test/ragel.d/high3.rl
diff --git a/test/cases/ragel.d/import1.rl b/test/ragel.d/import1.rl
index 0c7769c3..0c7769c3 100644
--- a/test/cases/ragel.d/import1.rl
+++ b/test/ragel.d/import1.rl
diff --git a/test/cases/ragel.d/import2.h b/test/ragel.d/import2.h
index 707271dd..707271dd 100644
--- a/test/cases/ragel.d/import2.h
+++ b/test/ragel.d/import2.h
diff --git a/test/cases/ragel.d/import2.rl b/test/ragel.d/import2.rl
index 8588a6a7..8588a6a7 100644
--- a/test/cases/ragel.d/import2.rl
+++ b/test/ragel.d/import2.rl
diff --git a/test/cases/ragel.d/include1.rl b/test/ragel.d/include1.rl
index 719eeead..719eeead 100644
--- a/test/cases/ragel.d/include1.rl
+++ b/test/ragel.d/include1.rl
diff --git a/test/cases/ragel.d/include2.rl b/test/ragel.d/include2.rl
index 402ee36f..402ee36f 100644
--- a/test/cases/ragel.d/include2.rl
+++ b/test/ragel.d/include2.rl
diff --git a/test/cases/ragel.d/include3.rl b/test/ragel.d/include3.rl
index 1ef55732..1ef55732 100644
--- a/test/cases/ragel.d/include3.rl
+++ b/test/ragel.d/include3.rl
diff --git a/test/cases/ragel.d/include3/smtp_addr_parser.rl b/test/ragel.d/include3/smtp_addr_parser.rl
index 4c446e1b..4c446e1b 100644
--- a/test/cases/ragel.d/include3/smtp_addr_parser.rl
+++ b/test/ragel.d/include3/smtp_addr_parser.rl
diff --git a/test/cases/ragel.d/include3/smtp_address.rl b/test/ragel.d/include3/smtp_address.rl
index 1170ebfe..1170ebfe 100644
--- a/test/cases/ragel.d/include3/smtp_address.rl
+++ b/test/ragel.d/include3/smtp_address.rl
diff --git a/test/cases/ragel.d/include3/smtp_ip.rl b/test/ragel.d/include3/smtp_ip.rl
index f2b7633b..f2b7633b 100644
--- a/test/cases/ragel.d/include3/smtp_ip.rl
+++ b/test/ragel.d/include3/smtp_ip.rl
diff --git a/test/cases/ragel.d/include3/smtp_whitespace.rl b/test/ragel.d/include3/smtp_whitespace.rl
index a62f739c..a62f739c 100644
--- a/test/cases/ragel.d/include3/smtp_whitespace.rl
+++ b/test/ragel.d/include3/smtp_whitespace.rl
diff --git a/test/cases/ragel.d/java1.rl b/test/ragel.d/java1.rl
index 68e3dd22..68e3dd22 100644
--- a/test/cases/ragel.d/java1.rl
+++ b/test/ragel.d/java1.rl
diff --git a/test/cases/ragel.d/java2.rl b/test/ragel.d/java2.rl
index 35a851cc..35a851cc 100644
--- a/test/cases/ragel.d/java2.rl
+++ b/test/ragel.d/java2.rl
diff --git a/test/cases/ragel.d/julia1.rl b/test/ragel.d/julia1.rl
index df11994f..df11994f 100644
--- a/test/cases/ragel.d/julia1.rl
+++ b/test/ragel.d/julia1.rl
diff --git a/test/cases/ragel.d/keller1.rl b/test/ragel.d/keller1.rl
index 9ec5da41..9ec5da41 100644
--- a/test/cases/ragel.d/keller1.rl
+++ b/test/ragel.d/keller1.rl
diff --git a/test/cases/ragel.d/lmgoto.rl b/test/ragel.d/lmgoto.rl
index 53284f41..53284f41 100644
--- a/test/cases/ragel.d/lmgoto.rl
+++ b/test/ragel.d/lmgoto.rl
diff --git a/test/cases/ragel.d/lmnfa1.rl b/test/ragel.d/lmnfa1.rl
index d5ec87ec..d5ec87ec 100644
--- a/test/cases/ragel.d/lmnfa1.rl
+++ b/test/ragel.d/lmnfa1.rl
diff --git a/test/cases/ragel.d/mailbox1.h b/test/ragel.d/mailbox1.h
index b6833569..b6833569 100644
--- a/test/cases/ragel.d/mailbox1.h
+++ b/test/ragel.d/mailbox1.h
diff --git a/test/cases/ragel.d/mailbox1.rl b/test/ragel.d/mailbox1.rl
index 3b0a6de3..3b0a6de3 100644
--- a/test/cases/ragel.d/mailbox1.rl
+++ b/test/ragel.d/mailbox1.rl
diff --git a/test/cases/ragel.d/mailbox2.rl b/test/ragel.d/mailbox2.rl
index 6b9d7359..6b9d7359 100644
--- a/test/cases/ragel.d/mailbox2.rl
+++ b/test/ragel.d/mailbox2.rl
diff --git a/test/cases/ragel.d/mailbox3.rl b/test/ragel.d/mailbox3.rl
index 892dc513..892dc513 100644
--- a/test/cases/ragel.d/mailbox3.rl
+++ b/test/ragel.d/mailbox3.rl
diff --git a/test/cases/ragel.d/main.c b/test/ragel.d/main.c
index 7d3b0824..7d3b0824 100644
--- a/test/cases/ragel.d/main.c
+++ b/test/ragel.d/main.c
diff --git a/test/cases/ragel.d/minimize1.rl b/test/ragel.d/minimize1.rl
index 0cb47368..0cb47368 100644
--- a/test/cases/ragel.d/minimize1.rl
+++ b/test/ragel.d/minimize1.rl
diff --git a/test/cases/ragel.d/ncall1.rl b/test/ragel.d/ncall1.rl
index 9268ad31..9268ad31 100644
--- a/test/cases/ragel.d/ncall1.rl
+++ b/test/ragel.d/ncall1.rl
diff --git a/test/cases/ragel.d/next1.rl b/test/ragel.d/next1.rl
index 6b53f510..6b53f510 100644
--- a/test/cases/ragel.d/next1.rl
+++ b/test/ragel.d/next1.rl
diff --git a/test/cases/ragel.d/next2.rl b/test/ragel.d/next2.rl
index 9f8ffe2a..9f8ffe2a 100644
--- a/test/cases/ragel.d/next2.rl
+++ b/test/ragel.d/next2.rl
diff --git a/test/cases/ragel.d/nfa1.rl b/test/ragel.d/nfa1.rl
index 38732a98..38732a98 100644
--- a/test/cases/ragel.d/nfa1.rl
+++ b/test/ragel.d/nfa1.rl
diff --git a/test/cases/ragel.d/nfa2.rl b/test/ragel.d/nfa2.rl
index 1f4f104b..1f4f104b 100644
--- a/test/cases/ragel.d/nfa2.rl
+++ b/test/ragel.d/nfa2.rl
diff --git a/test/cases/ragel.d/nfa3.rl b/test/ragel.d/nfa3.rl
index 597fba57..597fba57 100644
--- a/test/cases/ragel.d/nfa3.rl
+++ b/test/ragel.d/nfa3.rl
diff --git a/test/cases/ragel.d/noignore.rl b/test/ragel.d/noignore.rl
index dfa36b6e..dfa36b6e 100644
--- a/test/cases/ragel.d/noignore.rl
+++ b/test/ragel.d/noignore.rl
diff --git a/test/cases/ragel.d/patact.rl b/test/ragel.d/patact.rl
index a10ec3ad..a10ec3ad 100644
--- a/test/cases/ragel.d/patact.rl
+++ b/test/ragel.d/patact.rl
diff --git a/test/cases/ragel.d/perftest b/test/ragel.d/perftest
index d782bb28..d782bb28 100644
--- a/test/cases/ragel.d/perftest
+++ b/test/ragel.d/perftest
diff --git a/test/cases/ragel.d/range.rl b/test/ragel.d/range.rl
index 6c75b4c7..6c75b4c7 100644
--- a/test/cases/ragel.d/range.rl
+++ b/test/ragel.d/range.rl
diff --git a/test/cases/ragel.d/rangei.rl b/test/ragel.d/rangei.rl
index 1b523556..1b523556 100644
--- a/test/cases/ragel.d/rangei.rl
+++ b/test/ragel.d/rangei.rl
diff --git a/test/cases/ragel.d/recdescent1.rl b/test/ragel.d/recdescent1.rl
index ab8ccb10..ab8ccb10 100644
--- a/test/cases/ragel.d/recdescent1.rl
+++ b/test/ragel.d/recdescent1.rl
diff --git a/test/cases/ragel.d/recdescent2.rl b/test/ragel.d/recdescent2.rl
index b27c81f1..b27c81f1 100644
--- a/test/cases/ragel.d/recdescent2.rl
+++ b/test/ragel.d/recdescent2.rl
diff --git a/test/cases/ragel.d/recdescent4.rl b/test/ragel.d/recdescent4.rl
index 614053d8..614053d8 100644
--- a/test/cases/ragel.d/recdescent4.rl
+++ b/test/ragel.d/recdescent4.rl
diff --git a/test/cases/ragel.d/recdescent5.rl b/test/ragel.d/recdescent5.rl
index c6daa86c..c6daa86c 100644
--- a/test/cases/ragel.d/recdescent5.rl
+++ b/test/ragel.d/recdescent5.rl
diff --git a/test/cases/ragel.d/repetition.rl b/test/ragel.d/repetition.rl
index 1734af24..1734af24 100644
--- a/test/cases/ragel.d/repetition.rl
+++ b/test/ragel.d/repetition.rl
diff --git a/test/cases/ragel.d/rlscan.rl b/test/ragel.d/rlscan.rl
index ff1f7abc..ff1f7abc 100644
--- a/test/cases/ragel.d/rlscan.rl
+++ b/test/ragel.d/rlscan.rl
diff --git a/test/cases/ragel.d/rpn1.rl b/test/ragel.d/rpn1.rl
index 4d63daa5..4d63daa5 100644
--- a/test/cases/ragel.d/rpn1.rl
+++ b/test/ragel.d/rpn1.rl
diff --git a/test/cases/ragel.d/ruby1.rl b/test/ragel.d/ruby1.rl
index 8c42cce5..8c42cce5 100644
--- a/test/cases/ragel.d/ruby1.rl
+++ b/test/ragel.d/ruby1.rl
diff --git a/test/cases/ragel.d/rust1.rl b/test/ragel.d/rust1.rl
index 8a95425e..8a95425e 100644
--- a/test/cases/ragel.d/rust1.rl
+++ b/test/ragel.d/rust1.rl
diff --git a/test/cases/ragel.d/scan1.rl b/test/ragel.d/scan1.rl
index 32db0d8d..32db0d8d 100644
--- a/test/cases/ragel.d/scan1.rl
+++ b/test/ragel.d/scan1.rl
diff --git a/test/cases/ragel.d/scan2.rl b/test/ragel.d/scan2.rl
index 167b2c8c..167b2c8c 100644
--- a/test/cases/ragel.d/scan2.rl
+++ b/test/ragel.d/scan2.rl
diff --git a/test/cases/ragel.d/scan3.rl b/test/ragel.d/scan3.rl
index 80ab4815..80ab4815 100644
--- a/test/cases/ragel.d/scan3.rl
+++ b/test/ragel.d/scan3.rl
diff --git a/test/cases/ragel.d/scan4.rl b/test/ragel.d/scan4.rl
index 44f24b16..44f24b16 100644
--- a/test/cases/ragel.d/scan4.rl
+++ b/test/ragel.d/scan4.rl
diff --git a/test/cases/ragel.d/scan5.rl b/test/ragel.d/scan5.rl
index d9abd36e..d9abd36e 100644
--- a/test/cases/ragel.d/scan5.rl
+++ b/test/ragel.d/scan5.rl
diff --git a/test/cases/ragel.d/scan6.rl b/test/ragel.d/scan6.rl
index d841f110..d841f110 100644
--- a/test/cases/ragel.d/scan6.rl
+++ b/test/ragel.d/scan6.rl
diff --git a/test/cases/ragel.d/scan7.rl b/test/ragel.d/scan7.rl
index f8ed9a43..f8ed9a43 100644
--- a/test/cases/ragel.d/scan7.rl
+++ b/test/ragel.d/scan7.rl
diff --git a/test/cases/ragel.d/stateact1.rl b/test/ragel.d/stateact1.rl
index e5878b7c..e5878b7c 100644
--- a/test/cases/ragel.d/stateact1.rl
+++ b/test/ragel.d/stateact1.rl
diff --git a/test/cases/ragel.d/statechart1.rl b/test/ragel.d/statechart1.rl
index 1d6c2d27..1d6c2d27 100644
--- a/test/cases/ragel.d/statechart1.rl
+++ b/test/ragel.d/statechart1.rl
diff --git a/test/cases/ragel.d/strings1.rl b/test/ragel.d/strings1.rl
index 5e3ef9f9..5e3ef9f9 100644
--- a/test/cases/ragel.d/strings1.rl
+++ b/test/ragel.d/strings1.rl
diff --git a/test/cases/ragel.d/strings2.h b/test/ragel.d/strings2.h
index 1cf0ce9a..1cf0ce9a 100644
--- a/test/cases/ragel.d/strings2.h
+++ b/test/ragel.d/strings2.h
diff --git a/test/cases/ragel.d/strings2.rl b/test/ragel.d/strings2.rl
index b30b74fd..b30b74fd 100644
--- a/test/cases/ragel.d/strings2.rl
+++ b/test/ragel.d/strings2.rl
diff --git a/test/cases/ragel.d/strings3.rl b/test/ragel.d/strings3.rl
index 97eb6d24..97eb6d24 100644
--- a/test/cases/ragel.d/strings3.rl
+++ b/test/ragel.d/strings3.rl
diff --git a/test/cases/ragel.d/subject.mk.in b/test/ragel.d/subject.mk.in
index 7f4bfd99..7f4bfd99 100644
--- a/test/cases/ragel.d/subject.mk.in
+++ b/test/ragel.d/subject.mk.in
diff --git a/test/cases/ragel.d/subject.sh.in b/test/ragel.d/subject.sh.in
index 561624f0..561624f0 100644
--- a/test/cases/ragel.d/subject.sh.in
+++ b/test/ragel.d/subject.sh.in
diff --git a/test/cases/ragel.d/targs1.rl b/test/ragel.d/targs1.rl
index b97a550e..b97a550e 100644
--- a/test/cases/ragel.d/targs1.rl
+++ b/test/ragel.d/targs1.rl
diff --git a/test/cases/ragel.d/tofrom1.rl b/test/ragel.d/tofrom1.rl
index 74472ecf..74472ecf 100644
--- a/test/cases/ragel.d/tofrom1.rl
+++ b/test/ragel.d/tofrom1.rl
diff --git a/test/cases/ragel.d/tofrom2.rl b/test/ragel.d/tofrom2.rl
index 3c201e73..3c201e73 100644
--- a/test/cases/ragel.d/tofrom2.rl
+++ b/test/ragel.d/tofrom2.rl
diff --git a/test/cases/ragel.d/tokstart1.rl b/test/ragel.d/tokstart1.rl
index 5e897629..5e897629 100644
--- a/test/cases/ragel.d/tokstart1.rl
+++ b/test/ragel.d/tokstart1.rl
diff --git a/test/cases/ragel.d/trans-asm.lm b/test/ragel.d/trans-asm.lm
index 4c1ad188..4c1ad188 100644
--- a/test/cases/ragel.d/trans-asm.lm
+++ b/test/ragel.d/trans-asm.lm
diff --git a/test/cases/ragel.d/trans-c.lm b/test/ragel.d/trans-c.lm
index 108c3c44..108c3c44 100644
--- a/test/cases/ragel.d/trans-c.lm
+++ b/test/ragel.d/trans-c.lm
diff --git a/test/cases/ragel.d/trans-crack.lm b/test/ragel.d/trans-crack.lm
index ba2ed1cc..ba2ed1cc 100644
--- a/test/cases/ragel.d/trans-crack.lm
+++ b/test/ragel.d/trans-crack.lm
diff --git a/test/cases/ragel.d/trans-csharp.lm b/test/ragel.d/trans-csharp.lm
index e546dafe..e546dafe 100644
--- a/test/cases/ragel.d/trans-csharp.lm
+++ b/test/ragel.d/trans-csharp.lm
diff --git a/test/cases/ragel.d/trans-d.lm b/test/ragel.d/trans-d.lm
index 8176bc6b..8176bc6b 100644
--- a/test/cases/ragel.d/trans-d.lm
+++ b/test/ragel.d/trans-d.lm
diff --git a/test/cases/ragel.d/trans-go.lm b/test/ragel.d/trans-go.lm
index d9543b33..d9543b33 100644
--- a/test/cases/ragel.d/trans-go.lm
+++ b/test/ragel.d/trans-go.lm
diff --git a/test/cases/ragel.d/trans-java.lm b/test/ragel.d/trans-java.lm
index 5d2b52bd..5d2b52bd 100644
--- a/test/cases/ragel.d/trans-java.lm
+++ b/test/ragel.d/trans-java.lm
diff --git a/test/cases/ragel.d/trans-julia.lm b/test/ragel.d/trans-julia.lm
index d67635bf..d67635bf 100644
--- a/test/cases/ragel.d/trans-julia.lm
+++ b/test/ragel.d/trans-julia.lm
diff --git a/test/cases/ragel.d/trans-ocaml.lm b/test/ragel.d/trans-ocaml.lm
index 6cec5ad4..6cec5ad4 100644
--- a/test/cases/ragel.d/trans-ocaml.lm
+++ b/test/ragel.d/trans-ocaml.lm
diff --git a/test/cases/ragel.d/trans-ruby.lm b/test/ragel.d/trans-ruby.lm
index 53e108c0..53e108c0 100644
--- a/test/cases/ragel.d/trans-ruby.lm
+++ b/test/ragel.d/trans-ruby.lm
diff --git a/test/cases/ragel.d/trans-rust.lm b/test/ragel.d/trans-rust.lm
index 94a77035..94a77035 100644
--- a/test/cases/ragel.d/trans-rust.lm
+++ b/test/ragel.d/trans-rust.lm
diff --git a/test/cases/ragel.d/trans.lm b/test/ragel.d/trans.lm
index 660f94b8..660f94b8 100644
--- a/test/cases/ragel.d/trans.lm
+++ b/test/ragel.d/trans.lm
diff --git a/test/cases/ragel.d/union.rl b/test/ragel.d/union.rl
index c5596399..c5596399 100644
--- a/test/cases/ragel.d/union.rl
+++ b/test/ragel.d/union.rl
diff --git a/test/cases/ragel.d/url1.rl b/test/ragel.d/url1.rl
index fffc6b4f..fffc6b4f 100644
--- a/test/cases/ragel.d/url1.rl
+++ b/test/ragel.d/url1.rl
diff --git a/test/cases/ragel.d/xml.rl b/test/ragel.d/xml.rl
index e010ffb6..e010ffb6 100644
--- a/test/cases/ragel.d/xml.rl
+++ b/test/ragel.d/xml.rl
diff --git a/test/cases/ragel.d/xmlcommon.rl b/test/ragel.d/xmlcommon.rl
index dd4a38c0..dd4a38c0 100644
--- a/test/cases/ragel.d/xmlcommon.rl
+++ b/test/ragel.d/xmlcommon.rl
diff --git a/test/cases/ragel.d/zlen1.rl b/test/ragel.d/zlen1.rl
index 279818a0..279818a0 100644
--- a/test/cases/ragel.d/zlen1.rl
+++ b/test/ragel.d/zlen1.rl
diff --git a/test/cases/rlhc.d/.gitignore b/test/rlhc.d/.gitignore
index d83ab360..d83ab360 100644
--- a/test/cases/rlhc.d/.gitignore
+++ b/test/rlhc.d/.gitignore
diff --git a/test/cases/rlhc.d/Makefile b/test/rlhc.d/Makefile
index dbcc5cb2..dbcc5cb2 100644
--- a/test/cases/rlhc.d/Makefile
+++ b/test/rlhc.d/Makefile
diff --git a/test/cases/rlhc.d/case/any1_c.c-C-F0--goto-backend.exp b/test/rlhc.d/case/any1_c.c-C-F0--goto-backend.exp
index da594c3d..da594c3d 100644
--- a/test/cases/rlhc.d/case/any1_c.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/any1_c.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_c.c-C-F0--goto-backend.in b/test/rlhc.d/case/any1_c.c-C-F0--goto-backend.in
index 0fe45830..0fe45830 100644
--- a/test/cases/rlhc.d/case/any1_c.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/any1_c.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/any1_c.c-C-F0--var-backend.exp b/test/rlhc.d/case/any1_c.c-C-F0--var-backend.exp
index 6e957ec9..6e957ec9 100644
--- a/test/cases/rlhc.d/case/any1_c.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/any1_c.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_c.c-C-F0--var-backend.in b/test/rlhc.d/case/any1_c.c-C-F0--var-backend.in
index d32f122c..d32f122c 100644
--- a/test/cases/rlhc.d/case/any1_c.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/any1_c.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/any1_c.c-C-F1--goto-backend.exp b/test/rlhc.d/case/any1_c.c-C-F1--goto-backend.exp
index 1570ec73..1570ec73 100644
--- a/test/cases/rlhc.d/case/any1_c.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/any1_c.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_c.c-C-F1--goto-backend.in b/test/rlhc.d/case/any1_c.c-C-F1--goto-backend.in
index c1d6caef..c1d6caef 100644
--- a/test/cases/rlhc.d/case/any1_c.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/any1_c.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/any1_c.c-C-F1--var-backend.exp b/test/rlhc.d/case/any1_c.c-C-F1--var-backend.exp
index 6e957ec9..6e957ec9 100644
--- a/test/cases/rlhc.d/case/any1_c.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/any1_c.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_c.c-C-F1--var-backend.in b/test/rlhc.d/case/any1_c.c-C-F1--var-backend.in
index d32f122c..d32f122c 100644
--- a/test/cases/rlhc.d/case/any1_c.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/any1_c.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/any1_c.c-C-G0--goto-backend.exp b/test/rlhc.d/case/any1_c.c-C-G0--goto-backend.exp
index 90578bdf..90578bdf 100644
--- a/test/cases/rlhc.d/case/any1_c.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/any1_c.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_c.c-C-G0--goto-backend.in b/test/rlhc.d/case/any1_c.c-C-G0--goto-backend.in
index 3218a9af..3218a9af 100644
--- a/test/cases/rlhc.d/case/any1_c.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/any1_c.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/any1_c.c-C-G1--goto-backend.exp b/test/rlhc.d/case/any1_c.c-C-G1--goto-backend.exp
index 2c922c27..2c922c27 100644
--- a/test/cases/rlhc.d/case/any1_c.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/any1_c.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_c.c-C-G1--goto-backend.in b/test/rlhc.d/case/any1_c.c-C-G1--goto-backend.in
index 0931412c..0931412c 100644
--- a/test/cases/rlhc.d/case/any1_c.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/any1_c.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/any1_c.c-C-G2--goto-backend.exp b/test/rlhc.d/case/any1_c.c-C-G2--goto-backend.exp
index 4c8dbb3c..4c8dbb3c 100644
--- a/test/cases/rlhc.d/case/any1_c.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/any1_c.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_c.c-C-G2--goto-backend.in b/test/rlhc.d/case/any1_c.c-C-G2--goto-backend.in
index ea24ecaf..ea24ecaf 100644
--- a/test/cases/rlhc.d/case/any1_c.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/any1_c.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/any1_c.c-C-T0--goto-backend.exp b/test/rlhc.d/case/any1_c.c-C-T0--goto-backend.exp
index 8dc31b39..8dc31b39 100644
--- a/test/cases/rlhc.d/case/any1_c.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/any1_c.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_c.c-C-T0--goto-backend.in b/test/rlhc.d/case/any1_c.c-C-T0--goto-backend.in
index 4f57cf0d..4f57cf0d 100644
--- a/test/cases/rlhc.d/case/any1_c.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/any1_c.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/any1_c.c-C-T0--var-backend.exp b/test/rlhc.d/case/any1_c.c-C-T0--var-backend.exp
index b9b4f7f8..b9b4f7f8 100644
--- a/test/cases/rlhc.d/case/any1_c.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/any1_c.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_c.c-C-T0--var-backend.in b/test/rlhc.d/case/any1_c.c-C-T0--var-backend.in
index 69173628..69173628 100644
--- a/test/cases/rlhc.d/case/any1_c.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/any1_c.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/any1_c.c-C-T1--goto-backend.exp b/test/rlhc.d/case/any1_c.c-C-T1--goto-backend.exp
index d35c65f7..d35c65f7 100644
--- a/test/cases/rlhc.d/case/any1_c.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/any1_c.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_c.c-C-T1--goto-backend.in b/test/rlhc.d/case/any1_c.c-C-T1--goto-backend.in
index 98b6d402..98b6d402 100644
--- a/test/cases/rlhc.d/case/any1_c.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/any1_c.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/any1_c.c-C-T1--var-backend.exp b/test/rlhc.d/case/any1_c.c-C-T1--var-backend.exp
index 5ff14eec..5ff14eec 100644
--- a/test/cases/rlhc.d/case/any1_c.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/any1_c.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_c.c-C-T1--var-backend.in b/test/rlhc.d/case/any1_c.c-C-T1--var-backend.in
index 6bc67c44..6bc67c44 100644
--- a/test/cases/rlhc.d/case/any1_c.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/any1_c.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/any1_crack.crk-K-F0--var-backend.exp b/test/rlhc.d/case/any1_crack.crk-K-F0--var-backend.exp
index f8950f33..f8950f33 100644
--- a/test/cases/rlhc.d/case/any1_crack.crk-K-F0--var-backend.exp
+++ b/test/rlhc.d/case/any1_crack.crk-K-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_crack.crk-K-F0--var-backend.in b/test/rlhc.d/case/any1_crack.crk-K-F0--var-backend.in
index cad9ed85..cad9ed85 100644
--- a/test/cases/rlhc.d/case/any1_crack.crk-K-F0--var-backend.in
+++ b/test/rlhc.d/case/any1_crack.crk-K-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/any1_crack.crk-K-F1--var-backend.exp b/test/rlhc.d/case/any1_crack.crk-K-F1--var-backend.exp
index f8950f33..f8950f33 100644
--- a/test/cases/rlhc.d/case/any1_crack.crk-K-F1--var-backend.exp
+++ b/test/rlhc.d/case/any1_crack.crk-K-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_crack.crk-K-F1--var-backend.in b/test/rlhc.d/case/any1_crack.crk-K-F1--var-backend.in
index cad9ed85..cad9ed85 100644
--- a/test/cases/rlhc.d/case/any1_crack.crk-K-F1--var-backend.in
+++ b/test/rlhc.d/case/any1_crack.crk-K-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/any1_crack.crk-K-T0--var-backend.exp b/test/rlhc.d/case/any1_crack.crk-K-T0--var-backend.exp
index 695e1259..695e1259 100644
--- a/test/cases/rlhc.d/case/any1_crack.crk-K-T0--var-backend.exp
+++ b/test/rlhc.d/case/any1_crack.crk-K-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_crack.crk-K-T0--var-backend.in b/test/rlhc.d/case/any1_crack.crk-K-T0--var-backend.in
index eb2fdfc2..eb2fdfc2 100644
--- a/test/cases/rlhc.d/case/any1_crack.crk-K-T0--var-backend.in
+++ b/test/rlhc.d/case/any1_crack.crk-K-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/any1_crack.crk-K-T1--var-backend.exp b/test/rlhc.d/case/any1_crack.crk-K-T1--var-backend.exp
index 881d8e20..881d8e20 100644
--- a/test/cases/rlhc.d/case/any1_crack.crk-K-T1--var-backend.exp
+++ b/test/rlhc.d/case/any1_crack.crk-K-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_crack.crk-K-T1--var-backend.in b/test/rlhc.d/case/any1_crack.crk-K-T1--var-backend.in
index 668fd83a..668fd83a 100644
--- a/test/cases/rlhc.d/case/any1_crack.crk-K-T1--var-backend.in
+++ b/test/rlhc.d/case/any1_crack.crk-K-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/any1_cs.cs-A-F0--goto-backend.exp b/test/rlhc.d/case/any1_cs.cs-A-F0--goto-backend.exp
index 44568725..44568725 100644
--- a/test/cases/rlhc.d/case/any1_cs.cs-A-F0--goto-backend.exp
+++ b/test/rlhc.d/case/any1_cs.cs-A-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_cs.cs-A-F0--goto-backend.in b/test/rlhc.d/case/any1_cs.cs-A-F0--goto-backend.in
index c491e1ad..c491e1ad 100644
--- a/test/cases/rlhc.d/case/any1_cs.cs-A-F0--goto-backend.in
+++ b/test/rlhc.d/case/any1_cs.cs-A-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/any1_cs.cs-A-F0--var-backend.exp b/test/rlhc.d/case/any1_cs.cs-A-F0--var-backend.exp
index ff505fcb..ff505fcb 100644
--- a/test/cases/rlhc.d/case/any1_cs.cs-A-F0--var-backend.exp
+++ b/test/rlhc.d/case/any1_cs.cs-A-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_cs.cs-A-F0--var-backend.in b/test/rlhc.d/case/any1_cs.cs-A-F0--var-backend.in
index 025df4a3..025df4a3 100644
--- a/test/cases/rlhc.d/case/any1_cs.cs-A-F0--var-backend.in
+++ b/test/rlhc.d/case/any1_cs.cs-A-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/any1_cs.cs-A-F1--goto-backend.exp b/test/rlhc.d/case/any1_cs.cs-A-F1--goto-backend.exp
index 4cc67d0c..4cc67d0c 100644
--- a/test/cases/rlhc.d/case/any1_cs.cs-A-F1--goto-backend.exp
+++ b/test/rlhc.d/case/any1_cs.cs-A-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_cs.cs-A-F1--goto-backend.in b/test/rlhc.d/case/any1_cs.cs-A-F1--goto-backend.in
index 41c2ced4..41c2ced4 100644
--- a/test/cases/rlhc.d/case/any1_cs.cs-A-F1--goto-backend.in
+++ b/test/rlhc.d/case/any1_cs.cs-A-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/any1_cs.cs-A-F1--var-backend.exp b/test/rlhc.d/case/any1_cs.cs-A-F1--var-backend.exp
index ff505fcb..ff505fcb 100644
--- a/test/cases/rlhc.d/case/any1_cs.cs-A-F1--var-backend.exp
+++ b/test/rlhc.d/case/any1_cs.cs-A-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_cs.cs-A-F1--var-backend.in b/test/rlhc.d/case/any1_cs.cs-A-F1--var-backend.in
index 025df4a3..025df4a3 100644
--- a/test/cases/rlhc.d/case/any1_cs.cs-A-F1--var-backend.in
+++ b/test/rlhc.d/case/any1_cs.cs-A-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/any1_cs.cs-A-G0--goto-backend.exp b/test/rlhc.d/case/any1_cs.cs-A-G0--goto-backend.exp
index e58f9a51..e58f9a51 100644
--- a/test/cases/rlhc.d/case/any1_cs.cs-A-G0--goto-backend.exp
+++ b/test/rlhc.d/case/any1_cs.cs-A-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_cs.cs-A-G0--goto-backend.in b/test/rlhc.d/case/any1_cs.cs-A-G0--goto-backend.in
index 11a75b5b..11a75b5b 100644
--- a/test/cases/rlhc.d/case/any1_cs.cs-A-G0--goto-backend.in
+++ b/test/rlhc.d/case/any1_cs.cs-A-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/any1_cs.cs-A-G1--goto-backend.exp b/test/rlhc.d/case/any1_cs.cs-A-G1--goto-backend.exp
index 66ffb5a3..66ffb5a3 100644
--- a/test/cases/rlhc.d/case/any1_cs.cs-A-G1--goto-backend.exp
+++ b/test/rlhc.d/case/any1_cs.cs-A-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_cs.cs-A-G1--goto-backend.in b/test/rlhc.d/case/any1_cs.cs-A-G1--goto-backend.in
index ff8e9cac..ff8e9cac 100644
--- a/test/cases/rlhc.d/case/any1_cs.cs-A-G1--goto-backend.in
+++ b/test/rlhc.d/case/any1_cs.cs-A-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/any1_cs.cs-A-T0--goto-backend.exp b/test/rlhc.d/case/any1_cs.cs-A-T0--goto-backend.exp
index d6322c9b..d6322c9b 100644
--- a/test/cases/rlhc.d/case/any1_cs.cs-A-T0--goto-backend.exp
+++ b/test/rlhc.d/case/any1_cs.cs-A-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_cs.cs-A-T0--goto-backend.in b/test/rlhc.d/case/any1_cs.cs-A-T0--goto-backend.in
index 63afe6b9..63afe6b9 100644
--- a/test/cases/rlhc.d/case/any1_cs.cs-A-T0--goto-backend.in
+++ b/test/rlhc.d/case/any1_cs.cs-A-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/any1_cs.cs-A-T0--var-backend.exp b/test/rlhc.d/case/any1_cs.cs-A-T0--var-backend.exp
index 60308e6c..60308e6c 100644
--- a/test/cases/rlhc.d/case/any1_cs.cs-A-T0--var-backend.exp
+++ b/test/rlhc.d/case/any1_cs.cs-A-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_cs.cs-A-T0--var-backend.in b/test/rlhc.d/case/any1_cs.cs-A-T0--var-backend.in
index 4732d55d..4732d55d 100644
--- a/test/cases/rlhc.d/case/any1_cs.cs-A-T0--var-backend.in
+++ b/test/rlhc.d/case/any1_cs.cs-A-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/any1_cs.cs-A-T1--goto-backend.exp b/test/rlhc.d/case/any1_cs.cs-A-T1--goto-backend.exp
index 2d24566b..2d24566b 100644
--- a/test/cases/rlhc.d/case/any1_cs.cs-A-T1--goto-backend.exp
+++ b/test/rlhc.d/case/any1_cs.cs-A-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_cs.cs-A-T1--goto-backend.in b/test/rlhc.d/case/any1_cs.cs-A-T1--goto-backend.in
index a790e9a8..a790e9a8 100644
--- a/test/cases/rlhc.d/case/any1_cs.cs-A-T1--goto-backend.in
+++ b/test/rlhc.d/case/any1_cs.cs-A-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/any1_cs.cs-A-T1--var-backend.exp b/test/rlhc.d/case/any1_cs.cs-A-T1--var-backend.exp
index c2005946..c2005946 100644
--- a/test/cases/rlhc.d/case/any1_cs.cs-A-T1--var-backend.exp
+++ b/test/rlhc.d/case/any1_cs.cs-A-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_cs.cs-A-T1--var-backend.in b/test/rlhc.d/case/any1_cs.cs-A-T1--var-backend.in
index 29891515..29891515 100644
--- a/test/cases/rlhc.d/case/any1_cs.cs-A-T1--var-backend.in
+++ b/test/rlhc.d/case/any1_cs.cs-A-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/any1_go.go-Z-F0--goto-backend.exp b/test/rlhc.d/case/any1_go.go-Z-F0--goto-backend.exp
index f7b4556c..f7b4556c 100644
--- a/test/cases/rlhc.d/case/any1_go.go-Z-F0--goto-backend.exp
+++ b/test/rlhc.d/case/any1_go.go-Z-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_go.go-Z-F0--goto-backend.in b/test/rlhc.d/case/any1_go.go-Z-F0--goto-backend.in
index 8fa65c6a..8fa65c6a 100644
--- a/test/cases/rlhc.d/case/any1_go.go-Z-F0--goto-backend.in
+++ b/test/rlhc.d/case/any1_go.go-Z-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/any1_go.go-Z-F0--var-backend.exp b/test/rlhc.d/case/any1_go.go-Z-F0--var-backend.exp
index 1277697c..1277697c 100644
--- a/test/cases/rlhc.d/case/any1_go.go-Z-F0--var-backend.exp
+++ b/test/rlhc.d/case/any1_go.go-Z-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_go.go-Z-F0--var-backend.in b/test/rlhc.d/case/any1_go.go-Z-F0--var-backend.in
index 046e994d..046e994d 100644
--- a/test/cases/rlhc.d/case/any1_go.go-Z-F0--var-backend.in
+++ b/test/rlhc.d/case/any1_go.go-Z-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/any1_go.go-Z-F1--goto-backend.exp b/test/rlhc.d/case/any1_go.go-Z-F1--goto-backend.exp
index 422dac4e..422dac4e 100644
--- a/test/cases/rlhc.d/case/any1_go.go-Z-F1--goto-backend.exp
+++ b/test/rlhc.d/case/any1_go.go-Z-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_go.go-Z-F1--goto-backend.in b/test/rlhc.d/case/any1_go.go-Z-F1--goto-backend.in
index 8f52b7af..8f52b7af 100644
--- a/test/cases/rlhc.d/case/any1_go.go-Z-F1--goto-backend.in
+++ b/test/rlhc.d/case/any1_go.go-Z-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/any1_go.go-Z-F1--var-backend.exp b/test/rlhc.d/case/any1_go.go-Z-F1--var-backend.exp
index 1277697c..1277697c 100644
--- a/test/cases/rlhc.d/case/any1_go.go-Z-F1--var-backend.exp
+++ b/test/rlhc.d/case/any1_go.go-Z-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_go.go-Z-F1--var-backend.in b/test/rlhc.d/case/any1_go.go-Z-F1--var-backend.in
index 046e994d..046e994d 100644
--- a/test/cases/rlhc.d/case/any1_go.go-Z-F1--var-backend.in
+++ b/test/rlhc.d/case/any1_go.go-Z-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/any1_go.go-Z-G0--goto-backend.exp b/test/rlhc.d/case/any1_go.go-Z-G0--goto-backend.exp
index bc6beee8..bc6beee8 100644
--- a/test/cases/rlhc.d/case/any1_go.go-Z-G0--goto-backend.exp
+++ b/test/rlhc.d/case/any1_go.go-Z-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_go.go-Z-G0--goto-backend.in b/test/rlhc.d/case/any1_go.go-Z-G0--goto-backend.in
index cdd79b56..cdd79b56 100644
--- a/test/cases/rlhc.d/case/any1_go.go-Z-G0--goto-backend.in
+++ b/test/rlhc.d/case/any1_go.go-Z-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/any1_go.go-Z-G1--goto-backend.exp b/test/rlhc.d/case/any1_go.go-Z-G1--goto-backend.exp
index df64f4a3..df64f4a3 100644
--- a/test/cases/rlhc.d/case/any1_go.go-Z-G1--goto-backend.exp
+++ b/test/rlhc.d/case/any1_go.go-Z-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_go.go-Z-G1--goto-backend.in b/test/rlhc.d/case/any1_go.go-Z-G1--goto-backend.in
index 5b1d18f3..5b1d18f3 100644
--- a/test/cases/rlhc.d/case/any1_go.go-Z-G1--goto-backend.in
+++ b/test/rlhc.d/case/any1_go.go-Z-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/any1_go.go-Z-G2--goto-backend.exp b/test/rlhc.d/case/any1_go.go-Z-G2--goto-backend.exp
index 3b6a9eed..3b6a9eed 100644
--- a/test/cases/rlhc.d/case/any1_go.go-Z-G2--goto-backend.exp
+++ b/test/rlhc.d/case/any1_go.go-Z-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_go.go-Z-G2--goto-backend.in b/test/rlhc.d/case/any1_go.go-Z-G2--goto-backend.in
index 0b7e69c1..0b7e69c1 100644
--- a/test/cases/rlhc.d/case/any1_go.go-Z-G2--goto-backend.in
+++ b/test/rlhc.d/case/any1_go.go-Z-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/any1_go.go-Z-T0--goto-backend.exp b/test/rlhc.d/case/any1_go.go-Z-T0--goto-backend.exp
index 45d7bc28..45d7bc28 100644
--- a/test/cases/rlhc.d/case/any1_go.go-Z-T0--goto-backend.exp
+++ b/test/rlhc.d/case/any1_go.go-Z-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_go.go-Z-T0--goto-backend.in b/test/rlhc.d/case/any1_go.go-Z-T0--goto-backend.in
index 8a541d0f..8a541d0f 100644
--- a/test/cases/rlhc.d/case/any1_go.go-Z-T0--goto-backend.in
+++ b/test/rlhc.d/case/any1_go.go-Z-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/any1_go.go-Z-T0--var-backend.exp b/test/rlhc.d/case/any1_go.go-Z-T0--var-backend.exp
index 390006c8..390006c8 100644
--- a/test/cases/rlhc.d/case/any1_go.go-Z-T0--var-backend.exp
+++ b/test/rlhc.d/case/any1_go.go-Z-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_go.go-Z-T0--var-backend.in b/test/rlhc.d/case/any1_go.go-Z-T0--var-backend.in
index a70f4f23..a70f4f23 100644
--- a/test/cases/rlhc.d/case/any1_go.go-Z-T0--var-backend.in
+++ b/test/rlhc.d/case/any1_go.go-Z-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/any1_go.go-Z-T1--goto-backend.exp b/test/rlhc.d/case/any1_go.go-Z-T1--goto-backend.exp
index 17556159..17556159 100644
--- a/test/cases/rlhc.d/case/any1_go.go-Z-T1--goto-backend.exp
+++ b/test/rlhc.d/case/any1_go.go-Z-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_go.go-Z-T1--goto-backend.in b/test/rlhc.d/case/any1_go.go-Z-T1--goto-backend.in
index f8e050a1..f8e050a1 100644
--- a/test/cases/rlhc.d/case/any1_go.go-Z-T1--goto-backend.in
+++ b/test/rlhc.d/case/any1_go.go-Z-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/any1_go.go-Z-T1--var-backend.exp b/test/rlhc.d/case/any1_go.go-Z-T1--var-backend.exp
index f68706b9..f68706b9 100644
--- a/test/cases/rlhc.d/case/any1_go.go-Z-T1--var-backend.exp
+++ b/test/rlhc.d/case/any1_go.go-Z-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_go.go-Z-T1--var-backend.in b/test/rlhc.d/case/any1_go.go-Z-T1--var-backend.in
index c92fa191..c92fa191 100644
--- a/test/cases/rlhc.d/case/any1_go.go-Z-T1--var-backend.in
+++ b/test/rlhc.d/case/any1_go.go-Z-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/any1_java.java-J-F0--goto-backend.exp b/test/rlhc.d/case/any1_java.java-J-F0--goto-backend.exp
index 3a31b07f..3a31b07f 100644
--- a/test/cases/rlhc.d/case/any1_java.java-J-F0--goto-backend.exp
+++ b/test/rlhc.d/case/any1_java.java-J-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_java.java-J-F0--goto-backend.in b/test/rlhc.d/case/any1_java.java-J-F0--goto-backend.in
index 9fa81da7..9fa81da7 100644
--- a/test/cases/rlhc.d/case/any1_java.java-J-F0--goto-backend.in
+++ b/test/rlhc.d/case/any1_java.java-J-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/any1_java.java-J-F0--var-backend.exp b/test/rlhc.d/case/any1_java.java-J-F0--var-backend.exp
index 8487d059..8487d059 100644
--- a/test/cases/rlhc.d/case/any1_java.java-J-F0--var-backend.exp
+++ b/test/rlhc.d/case/any1_java.java-J-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_java.java-J-F0--var-backend.in b/test/rlhc.d/case/any1_java.java-J-F0--var-backend.in
index e599ecb3..e599ecb3 100644
--- a/test/cases/rlhc.d/case/any1_java.java-J-F0--var-backend.in
+++ b/test/rlhc.d/case/any1_java.java-J-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/any1_java.java-J-F1--goto-backend.exp b/test/rlhc.d/case/any1_java.java-J-F1--goto-backend.exp
index 521af1e6..521af1e6 100644
--- a/test/cases/rlhc.d/case/any1_java.java-J-F1--goto-backend.exp
+++ b/test/rlhc.d/case/any1_java.java-J-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_java.java-J-F1--goto-backend.in b/test/rlhc.d/case/any1_java.java-J-F1--goto-backend.in
index dd3ab9b5..dd3ab9b5 100644
--- a/test/cases/rlhc.d/case/any1_java.java-J-F1--goto-backend.in
+++ b/test/rlhc.d/case/any1_java.java-J-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/any1_java.java-J-F1--var-backend.exp b/test/rlhc.d/case/any1_java.java-J-F1--var-backend.exp
index 8487d059..8487d059 100644
--- a/test/cases/rlhc.d/case/any1_java.java-J-F1--var-backend.exp
+++ b/test/rlhc.d/case/any1_java.java-J-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_java.java-J-F1--var-backend.in b/test/rlhc.d/case/any1_java.java-J-F1--var-backend.in
index e599ecb3..e599ecb3 100644
--- a/test/cases/rlhc.d/case/any1_java.java-J-F1--var-backend.in
+++ b/test/rlhc.d/case/any1_java.java-J-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/any1_java.java-J-T0--goto-backend.exp b/test/rlhc.d/case/any1_java.java-J-T0--goto-backend.exp
index 80c428d8..80c428d8 100644
--- a/test/cases/rlhc.d/case/any1_java.java-J-T0--goto-backend.exp
+++ b/test/rlhc.d/case/any1_java.java-J-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_java.java-J-T0--goto-backend.in b/test/rlhc.d/case/any1_java.java-J-T0--goto-backend.in
index 402a247a..402a247a 100644
--- a/test/cases/rlhc.d/case/any1_java.java-J-T0--goto-backend.in
+++ b/test/rlhc.d/case/any1_java.java-J-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/any1_java.java-J-T0--var-backend.exp b/test/rlhc.d/case/any1_java.java-J-T0--var-backend.exp
index 51211f74..51211f74 100644
--- a/test/cases/rlhc.d/case/any1_java.java-J-T0--var-backend.exp
+++ b/test/rlhc.d/case/any1_java.java-J-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_java.java-J-T0--var-backend.in b/test/rlhc.d/case/any1_java.java-J-T0--var-backend.in
index 90d99840..90d99840 100644
--- a/test/cases/rlhc.d/case/any1_java.java-J-T0--var-backend.in
+++ b/test/rlhc.d/case/any1_java.java-J-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/any1_java.java-J-T1--goto-backend.exp b/test/rlhc.d/case/any1_java.java-J-T1--goto-backend.exp
index d35ffe55..d35ffe55 100644
--- a/test/cases/rlhc.d/case/any1_java.java-J-T1--goto-backend.exp
+++ b/test/rlhc.d/case/any1_java.java-J-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_java.java-J-T1--goto-backend.in b/test/rlhc.d/case/any1_java.java-J-T1--goto-backend.in
index 94ac3f46..94ac3f46 100644
--- a/test/cases/rlhc.d/case/any1_java.java-J-T1--goto-backend.in
+++ b/test/rlhc.d/case/any1_java.java-J-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/any1_java.java-J-T1--var-backend.exp b/test/rlhc.d/case/any1_java.java-J-T1--var-backend.exp
index 41ebe693..41ebe693 100644
--- a/test/cases/rlhc.d/case/any1_java.java-J-T1--var-backend.exp
+++ b/test/rlhc.d/case/any1_java.java-J-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_java.java-J-T1--var-backend.in b/test/rlhc.d/case/any1_java.java-J-T1--var-backend.in
index 685db3a8..685db3a8 100644
--- a/test/cases/rlhc.d/case/any1_java.java-J-T1--var-backend.in
+++ b/test/rlhc.d/case/any1_java.java-J-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/any1_julia.jl-Y-F0--var-backend.exp b/test/rlhc.d/case/any1_julia.jl-Y-F0--var-backend.exp
index 5a45507a..5a45507a 100644
--- a/test/cases/rlhc.d/case/any1_julia.jl-Y-F0--var-backend.exp
+++ b/test/rlhc.d/case/any1_julia.jl-Y-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_julia.jl-Y-F0--var-backend.in b/test/rlhc.d/case/any1_julia.jl-Y-F0--var-backend.in
index 9882a86d..9882a86d 100644
--- a/test/cases/rlhc.d/case/any1_julia.jl-Y-F0--var-backend.in
+++ b/test/rlhc.d/case/any1_julia.jl-Y-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/any1_julia.jl-Y-F1--var-backend.exp b/test/rlhc.d/case/any1_julia.jl-Y-F1--var-backend.exp
index 5a45507a..5a45507a 100644
--- a/test/cases/rlhc.d/case/any1_julia.jl-Y-F1--var-backend.exp
+++ b/test/rlhc.d/case/any1_julia.jl-Y-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_julia.jl-Y-F1--var-backend.in b/test/rlhc.d/case/any1_julia.jl-Y-F1--var-backend.in
index 9882a86d..9882a86d 100644
--- a/test/cases/rlhc.d/case/any1_julia.jl-Y-F1--var-backend.in
+++ b/test/rlhc.d/case/any1_julia.jl-Y-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/any1_julia.jl-Y-T0--var-backend.exp b/test/rlhc.d/case/any1_julia.jl-Y-T0--var-backend.exp
index 4a26a462..4a26a462 100644
--- a/test/cases/rlhc.d/case/any1_julia.jl-Y-T0--var-backend.exp
+++ b/test/rlhc.d/case/any1_julia.jl-Y-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_julia.jl-Y-T0--var-backend.in b/test/rlhc.d/case/any1_julia.jl-Y-T0--var-backend.in
index 00a53ebf..00a53ebf 100644
--- a/test/cases/rlhc.d/case/any1_julia.jl-Y-T0--var-backend.in
+++ b/test/rlhc.d/case/any1_julia.jl-Y-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/any1_julia.jl-Y-T1--var-backend.exp b/test/rlhc.d/case/any1_julia.jl-Y-T1--var-backend.exp
index a8b09b18..a8b09b18 100644
--- a/test/cases/rlhc.d/case/any1_julia.jl-Y-T1--var-backend.exp
+++ b/test/rlhc.d/case/any1_julia.jl-Y-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_julia.jl-Y-T1--var-backend.in b/test/rlhc.d/case/any1_julia.jl-Y-T1--var-backend.in
index 33004262..33004262 100644
--- a/test/cases/rlhc.d/case/any1_julia.jl-Y-T1--var-backend.in
+++ b/test/rlhc.d/case/any1_julia.jl-Y-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/any1_ocaml.ml-O-F0--var-backend.exp b/test/rlhc.d/case/any1_ocaml.ml-O-F0--var-backend.exp
index b969537d..b969537d 100644
--- a/test/cases/rlhc.d/case/any1_ocaml.ml-O-F0--var-backend.exp
+++ b/test/rlhc.d/case/any1_ocaml.ml-O-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_ocaml.ml-O-F0--var-backend.in b/test/rlhc.d/case/any1_ocaml.ml-O-F0--var-backend.in
index 601aaf57..601aaf57 100644
--- a/test/cases/rlhc.d/case/any1_ocaml.ml-O-F0--var-backend.in
+++ b/test/rlhc.d/case/any1_ocaml.ml-O-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/any1_ocaml.ml-O-F1--var-backend.exp b/test/rlhc.d/case/any1_ocaml.ml-O-F1--var-backend.exp
index b969537d..b969537d 100644
--- a/test/cases/rlhc.d/case/any1_ocaml.ml-O-F1--var-backend.exp
+++ b/test/rlhc.d/case/any1_ocaml.ml-O-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_ocaml.ml-O-F1--var-backend.in b/test/rlhc.d/case/any1_ocaml.ml-O-F1--var-backend.in
index 601aaf57..601aaf57 100644
--- a/test/cases/rlhc.d/case/any1_ocaml.ml-O-F1--var-backend.in
+++ b/test/rlhc.d/case/any1_ocaml.ml-O-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/any1_ocaml.ml-O-T0--var-backend.exp b/test/rlhc.d/case/any1_ocaml.ml-O-T0--var-backend.exp
index ff7e0d97..ff7e0d97 100644
--- a/test/cases/rlhc.d/case/any1_ocaml.ml-O-T0--var-backend.exp
+++ b/test/rlhc.d/case/any1_ocaml.ml-O-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_ocaml.ml-O-T0--var-backend.in b/test/rlhc.d/case/any1_ocaml.ml-O-T0--var-backend.in
index 3556714c..3556714c 100644
--- a/test/cases/rlhc.d/case/any1_ocaml.ml-O-T0--var-backend.in
+++ b/test/rlhc.d/case/any1_ocaml.ml-O-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/any1_ocaml.ml-O-T1--var-backend.exp b/test/rlhc.d/case/any1_ocaml.ml-O-T1--var-backend.exp
index 073c44d5..073c44d5 100644
--- a/test/cases/rlhc.d/case/any1_ocaml.ml-O-T1--var-backend.exp
+++ b/test/rlhc.d/case/any1_ocaml.ml-O-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_ocaml.ml-O-T1--var-backend.in b/test/rlhc.d/case/any1_ocaml.ml-O-T1--var-backend.in
index c4e6d40a..c4e6d40a 100644
--- a/test/cases/rlhc.d/case/any1_ocaml.ml-O-T1--var-backend.in
+++ b/test/rlhc.d/case/any1_ocaml.ml-O-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/any1_ruby.rb-R-F0--var-backend.exp b/test/rlhc.d/case/any1_ruby.rb-R-F0--var-backend.exp
index 256b5c8a..256b5c8a 100644
--- a/test/cases/rlhc.d/case/any1_ruby.rb-R-F0--var-backend.exp
+++ b/test/rlhc.d/case/any1_ruby.rb-R-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_ruby.rb-R-F0--var-backend.in b/test/rlhc.d/case/any1_ruby.rb-R-F0--var-backend.in
index d1b32a5d..d1b32a5d 100644
--- a/test/cases/rlhc.d/case/any1_ruby.rb-R-F0--var-backend.in
+++ b/test/rlhc.d/case/any1_ruby.rb-R-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/any1_ruby.rb-R-F1--var-backend.exp b/test/rlhc.d/case/any1_ruby.rb-R-F1--var-backend.exp
index 256b5c8a..256b5c8a 100644
--- a/test/cases/rlhc.d/case/any1_ruby.rb-R-F1--var-backend.exp
+++ b/test/rlhc.d/case/any1_ruby.rb-R-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_ruby.rb-R-F1--var-backend.in b/test/rlhc.d/case/any1_ruby.rb-R-F1--var-backend.in
index d1b32a5d..d1b32a5d 100644
--- a/test/cases/rlhc.d/case/any1_ruby.rb-R-F1--var-backend.in
+++ b/test/rlhc.d/case/any1_ruby.rb-R-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/any1_ruby.rb-R-T0--var-backend.exp b/test/rlhc.d/case/any1_ruby.rb-R-T0--var-backend.exp
index 9a8dcb19..9a8dcb19 100644
--- a/test/cases/rlhc.d/case/any1_ruby.rb-R-T0--var-backend.exp
+++ b/test/rlhc.d/case/any1_ruby.rb-R-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_ruby.rb-R-T0--var-backend.in b/test/rlhc.d/case/any1_ruby.rb-R-T0--var-backend.in
index 768d7dd4..768d7dd4 100644
--- a/test/cases/rlhc.d/case/any1_ruby.rb-R-T0--var-backend.in
+++ b/test/rlhc.d/case/any1_ruby.rb-R-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/any1_ruby.rb-R-T1--var-backend.exp b/test/rlhc.d/case/any1_ruby.rb-R-T1--var-backend.exp
index 61560f21..61560f21 100644
--- a/test/cases/rlhc.d/case/any1_ruby.rb-R-T1--var-backend.exp
+++ b/test/rlhc.d/case/any1_ruby.rb-R-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_ruby.rb-R-T1--var-backend.in b/test/rlhc.d/case/any1_ruby.rb-R-T1--var-backend.in
index 1456b78b..1456b78b 100644
--- a/test/cases/rlhc.d/case/any1_ruby.rb-R-T1--var-backend.in
+++ b/test/rlhc.d/case/any1_ruby.rb-R-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/any1_rust.rs-U-F0--var-backend.exp b/test/rlhc.d/case/any1_rust.rs-U-F0--var-backend.exp
index 351710db..351710db 100644
--- a/test/cases/rlhc.d/case/any1_rust.rs-U-F0--var-backend.exp
+++ b/test/rlhc.d/case/any1_rust.rs-U-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_rust.rs-U-F0--var-backend.in b/test/rlhc.d/case/any1_rust.rs-U-F0--var-backend.in
index 8d192c2e..8d192c2e 100644
--- a/test/cases/rlhc.d/case/any1_rust.rs-U-F0--var-backend.in
+++ b/test/rlhc.d/case/any1_rust.rs-U-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/any1_rust.rs-U-F1--var-backend.exp b/test/rlhc.d/case/any1_rust.rs-U-F1--var-backend.exp
index 351710db..351710db 100644
--- a/test/cases/rlhc.d/case/any1_rust.rs-U-F1--var-backend.exp
+++ b/test/rlhc.d/case/any1_rust.rs-U-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_rust.rs-U-F1--var-backend.in b/test/rlhc.d/case/any1_rust.rs-U-F1--var-backend.in
index 8d192c2e..8d192c2e 100644
--- a/test/cases/rlhc.d/case/any1_rust.rs-U-F1--var-backend.in
+++ b/test/rlhc.d/case/any1_rust.rs-U-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/any1_rust.rs-U-T0--var-backend.exp b/test/rlhc.d/case/any1_rust.rs-U-T0--var-backend.exp
index bba1212d..bba1212d 100644
--- a/test/cases/rlhc.d/case/any1_rust.rs-U-T0--var-backend.exp
+++ b/test/rlhc.d/case/any1_rust.rs-U-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_rust.rs-U-T0--var-backend.in b/test/rlhc.d/case/any1_rust.rs-U-T0--var-backend.in
index 89544799..89544799 100644
--- a/test/cases/rlhc.d/case/any1_rust.rs-U-T0--var-backend.in
+++ b/test/rlhc.d/case/any1_rust.rs-U-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/any1_rust.rs-U-T1--var-backend.exp b/test/rlhc.d/case/any1_rust.rs-U-T1--var-backend.exp
index 171db7b3..171db7b3 100644
--- a/test/cases/rlhc.d/case/any1_rust.rs-U-T1--var-backend.exp
+++ b/test/rlhc.d/case/any1_rust.rs-U-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/any1_rust.rs-U-T1--var-backend.in b/test/rlhc.d/case/any1_rust.rs-U-T1--var-backend.in
index 1edafd85..1edafd85 100644
--- a/test/cases/rlhc.d/case/any1_rust.rs-U-T1--var-backend.in
+++ b/test/rlhc.d/case/any1_rust.rs-U-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_c.c-C-F0--goto-backend.exp b/test/rlhc.d/case/atoi1_c.c-C-F0--goto-backend.exp
index bf62c8bd..bf62c8bd 100644
--- a/test/cases/rlhc.d/case/atoi1_c.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/atoi1_c.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_c.c-C-F0--goto-backend.in b/test/rlhc.d/case/atoi1_c.c-C-F0--goto-backend.in
index a4f5bb3b..a4f5bb3b 100644
--- a/test/cases/rlhc.d/case/atoi1_c.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/atoi1_c.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_c.c-C-F0--var-backend.exp b/test/rlhc.d/case/atoi1_c.c-C-F0--var-backend.exp
index f5d467f9..f5d467f9 100644
--- a/test/cases/rlhc.d/case/atoi1_c.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/atoi1_c.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_c.c-C-F0--var-backend.in b/test/rlhc.d/case/atoi1_c.c-C-F0--var-backend.in
index ccd7ff94..ccd7ff94 100644
--- a/test/cases/rlhc.d/case/atoi1_c.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/atoi1_c.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_c.c-C-F1--goto-backend.exp b/test/rlhc.d/case/atoi1_c.c-C-F1--goto-backend.exp
index a6db161a..a6db161a 100644
--- a/test/cases/rlhc.d/case/atoi1_c.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/atoi1_c.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_c.c-C-F1--goto-backend.in b/test/rlhc.d/case/atoi1_c.c-C-F1--goto-backend.in
index 4f5af82c..4f5af82c 100644
--- a/test/cases/rlhc.d/case/atoi1_c.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/atoi1_c.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_c.c-C-F1--var-backend.exp b/test/rlhc.d/case/atoi1_c.c-C-F1--var-backend.exp
index b27ec8a4..b27ec8a4 100644
--- a/test/cases/rlhc.d/case/atoi1_c.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/atoi1_c.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_c.c-C-F1--var-backend.in b/test/rlhc.d/case/atoi1_c.c-C-F1--var-backend.in
index 3bfb7d4a..3bfb7d4a 100644
--- a/test/cases/rlhc.d/case/atoi1_c.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/atoi1_c.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_c.c-C-G0--goto-backend.exp b/test/rlhc.d/case/atoi1_c.c-C-G0--goto-backend.exp
index 89d91c58..89d91c58 100644
--- a/test/cases/rlhc.d/case/atoi1_c.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/atoi1_c.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_c.c-C-G0--goto-backend.in b/test/rlhc.d/case/atoi1_c.c-C-G0--goto-backend.in
index 7d630ba4..7d630ba4 100644
--- a/test/cases/rlhc.d/case/atoi1_c.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/atoi1_c.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_c.c-C-G1--goto-backend.exp b/test/rlhc.d/case/atoi1_c.c-C-G1--goto-backend.exp
index 0e4e6ca9..0e4e6ca9 100644
--- a/test/cases/rlhc.d/case/atoi1_c.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/atoi1_c.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_c.c-C-G1--goto-backend.in b/test/rlhc.d/case/atoi1_c.c-C-G1--goto-backend.in
index 84154813..84154813 100644
--- a/test/cases/rlhc.d/case/atoi1_c.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/atoi1_c.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_c.c-C-G2--goto-backend.exp b/test/rlhc.d/case/atoi1_c.c-C-G2--goto-backend.exp
index 5810df01..5810df01 100644
--- a/test/cases/rlhc.d/case/atoi1_c.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/atoi1_c.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_c.c-C-G2--goto-backend.in b/test/rlhc.d/case/atoi1_c.c-C-G2--goto-backend.in
index d3ef55a2..d3ef55a2 100644
--- a/test/cases/rlhc.d/case/atoi1_c.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/atoi1_c.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_c.c-C-T0--goto-backend.exp b/test/rlhc.d/case/atoi1_c.c-C-T0--goto-backend.exp
index 571be6f0..571be6f0 100644
--- a/test/cases/rlhc.d/case/atoi1_c.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/atoi1_c.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_c.c-C-T0--goto-backend.in b/test/rlhc.d/case/atoi1_c.c-C-T0--goto-backend.in
index e5902871..e5902871 100644
--- a/test/cases/rlhc.d/case/atoi1_c.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/atoi1_c.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_c.c-C-T0--var-backend.exp b/test/rlhc.d/case/atoi1_c.c-C-T0--var-backend.exp
index 00ec73fe..00ec73fe 100644
--- a/test/cases/rlhc.d/case/atoi1_c.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/atoi1_c.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_c.c-C-T0--var-backend.in b/test/rlhc.d/case/atoi1_c.c-C-T0--var-backend.in
index 6c2e9aa4..6c2e9aa4 100644
--- a/test/cases/rlhc.d/case/atoi1_c.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/atoi1_c.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_c.c-C-T1--goto-backend.exp b/test/rlhc.d/case/atoi1_c.c-C-T1--goto-backend.exp
index a9b57747..a9b57747 100644
--- a/test/cases/rlhc.d/case/atoi1_c.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/atoi1_c.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_c.c-C-T1--goto-backend.in b/test/rlhc.d/case/atoi1_c.c-C-T1--goto-backend.in
index 009f468c..009f468c 100644
--- a/test/cases/rlhc.d/case/atoi1_c.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/atoi1_c.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_c.c-C-T1--var-backend.exp b/test/rlhc.d/case/atoi1_c.c-C-T1--var-backend.exp
index 9a1b1843..9a1b1843 100644
--- a/test/cases/rlhc.d/case/atoi1_c.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/atoi1_c.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_c.c-C-T1--var-backend.in b/test/rlhc.d/case/atoi1_c.c-C-T1--var-backend.in
index 0a322085..0a322085 100644
--- a/test/cases/rlhc.d/case/atoi1_c.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/atoi1_c.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_crack.crk-K-F0--var-backend.exp b/test/rlhc.d/case/atoi1_crack.crk-K-F0--var-backend.exp
index ffa39238..ffa39238 100644
--- a/test/cases/rlhc.d/case/atoi1_crack.crk-K-F0--var-backend.exp
+++ b/test/rlhc.d/case/atoi1_crack.crk-K-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_crack.crk-K-F0--var-backend.in b/test/rlhc.d/case/atoi1_crack.crk-K-F0--var-backend.in
index fa4c8b2f..fa4c8b2f 100644
--- a/test/cases/rlhc.d/case/atoi1_crack.crk-K-F0--var-backend.in
+++ b/test/rlhc.d/case/atoi1_crack.crk-K-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_crack.crk-K-F1--var-backend.exp b/test/rlhc.d/case/atoi1_crack.crk-K-F1--var-backend.exp
index 0745139f..0745139f 100644
--- a/test/cases/rlhc.d/case/atoi1_crack.crk-K-F1--var-backend.exp
+++ b/test/rlhc.d/case/atoi1_crack.crk-K-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_crack.crk-K-F1--var-backend.in b/test/rlhc.d/case/atoi1_crack.crk-K-F1--var-backend.in
index 31e9d95e..31e9d95e 100644
--- a/test/cases/rlhc.d/case/atoi1_crack.crk-K-F1--var-backend.in
+++ b/test/rlhc.d/case/atoi1_crack.crk-K-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_crack.crk-K-T0--var-backend.exp b/test/rlhc.d/case/atoi1_crack.crk-K-T0--var-backend.exp
index 9f8cef76..9f8cef76 100644
--- a/test/cases/rlhc.d/case/atoi1_crack.crk-K-T0--var-backend.exp
+++ b/test/rlhc.d/case/atoi1_crack.crk-K-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_crack.crk-K-T0--var-backend.in b/test/rlhc.d/case/atoi1_crack.crk-K-T0--var-backend.in
index 9ad75f54..9ad75f54 100644
--- a/test/cases/rlhc.d/case/atoi1_crack.crk-K-T0--var-backend.in
+++ b/test/rlhc.d/case/atoi1_crack.crk-K-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_crack.crk-K-T1--var-backend.exp b/test/rlhc.d/case/atoi1_crack.crk-K-T1--var-backend.exp
index 1236a0a0..1236a0a0 100644
--- a/test/cases/rlhc.d/case/atoi1_crack.crk-K-T1--var-backend.exp
+++ b/test/rlhc.d/case/atoi1_crack.crk-K-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_crack.crk-K-T1--var-backend.in b/test/rlhc.d/case/atoi1_crack.crk-K-T1--var-backend.in
index 4a2336a0..4a2336a0 100644
--- a/test/cases/rlhc.d/case/atoi1_crack.crk-K-T1--var-backend.in
+++ b/test/rlhc.d/case/atoi1_crack.crk-K-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_cs.cs-A-F0--goto-backend.exp b/test/rlhc.d/case/atoi1_cs.cs-A-F0--goto-backend.exp
index a974cd41..a974cd41 100644
--- a/test/cases/rlhc.d/case/atoi1_cs.cs-A-F0--goto-backend.exp
+++ b/test/rlhc.d/case/atoi1_cs.cs-A-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_cs.cs-A-F0--goto-backend.in b/test/rlhc.d/case/atoi1_cs.cs-A-F0--goto-backend.in
index fc998db8..fc998db8 100644
--- a/test/cases/rlhc.d/case/atoi1_cs.cs-A-F0--goto-backend.in
+++ b/test/rlhc.d/case/atoi1_cs.cs-A-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_cs.cs-A-F0--var-backend.exp b/test/rlhc.d/case/atoi1_cs.cs-A-F0--var-backend.exp
index fdda0bb9..fdda0bb9 100644
--- a/test/cases/rlhc.d/case/atoi1_cs.cs-A-F0--var-backend.exp
+++ b/test/rlhc.d/case/atoi1_cs.cs-A-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_cs.cs-A-F0--var-backend.in b/test/rlhc.d/case/atoi1_cs.cs-A-F0--var-backend.in
index 17cc2d7b..17cc2d7b 100644
--- a/test/cases/rlhc.d/case/atoi1_cs.cs-A-F0--var-backend.in
+++ b/test/rlhc.d/case/atoi1_cs.cs-A-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_cs.cs-A-F1--goto-backend.exp b/test/rlhc.d/case/atoi1_cs.cs-A-F1--goto-backend.exp
index 2dad5bb1..2dad5bb1 100644
--- a/test/cases/rlhc.d/case/atoi1_cs.cs-A-F1--goto-backend.exp
+++ b/test/rlhc.d/case/atoi1_cs.cs-A-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_cs.cs-A-F1--goto-backend.in b/test/rlhc.d/case/atoi1_cs.cs-A-F1--goto-backend.in
index a314aa6c..a314aa6c 100644
--- a/test/cases/rlhc.d/case/atoi1_cs.cs-A-F1--goto-backend.in
+++ b/test/rlhc.d/case/atoi1_cs.cs-A-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_cs.cs-A-F1--var-backend.exp b/test/rlhc.d/case/atoi1_cs.cs-A-F1--var-backend.exp
index 3a2cd0dc..3a2cd0dc 100644
--- a/test/cases/rlhc.d/case/atoi1_cs.cs-A-F1--var-backend.exp
+++ b/test/rlhc.d/case/atoi1_cs.cs-A-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_cs.cs-A-F1--var-backend.in b/test/rlhc.d/case/atoi1_cs.cs-A-F1--var-backend.in
index ab50a81e..ab50a81e 100644
--- a/test/cases/rlhc.d/case/atoi1_cs.cs-A-F1--var-backend.in
+++ b/test/rlhc.d/case/atoi1_cs.cs-A-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_cs.cs-A-G0--goto-backend.exp b/test/rlhc.d/case/atoi1_cs.cs-A-G0--goto-backend.exp
index 6c0edd2c..6c0edd2c 100644
--- a/test/cases/rlhc.d/case/atoi1_cs.cs-A-G0--goto-backend.exp
+++ b/test/rlhc.d/case/atoi1_cs.cs-A-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_cs.cs-A-G0--goto-backend.in b/test/rlhc.d/case/atoi1_cs.cs-A-G0--goto-backend.in
index 87c3341d..87c3341d 100644
--- a/test/cases/rlhc.d/case/atoi1_cs.cs-A-G0--goto-backend.in
+++ b/test/rlhc.d/case/atoi1_cs.cs-A-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_cs.cs-A-G1--goto-backend.exp b/test/rlhc.d/case/atoi1_cs.cs-A-G1--goto-backend.exp
index 62b6a95e..62b6a95e 100644
--- a/test/cases/rlhc.d/case/atoi1_cs.cs-A-G1--goto-backend.exp
+++ b/test/rlhc.d/case/atoi1_cs.cs-A-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_cs.cs-A-G1--goto-backend.in b/test/rlhc.d/case/atoi1_cs.cs-A-G1--goto-backend.in
index bd03be67..bd03be67 100644
--- a/test/cases/rlhc.d/case/atoi1_cs.cs-A-G1--goto-backend.in
+++ b/test/rlhc.d/case/atoi1_cs.cs-A-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_cs.cs-A-T0--goto-backend.exp b/test/rlhc.d/case/atoi1_cs.cs-A-T0--goto-backend.exp
index 48c620d6..48c620d6 100644
--- a/test/cases/rlhc.d/case/atoi1_cs.cs-A-T0--goto-backend.exp
+++ b/test/rlhc.d/case/atoi1_cs.cs-A-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_cs.cs-A-T0--goto-backend.in b/test/rlhc.d/case/atoi1_cs.cs-A-T0--goto-backend.in
index 3ab7f6f5..3ab7f6f5 100644
--- a/test/cases/rlhc.d/case/atoi1_cs.cs-A-T0--goto-backend.in
+++ b/test/rlhc.d/case/atoi1_cs.cs-A-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_cs.cs-A-T0--var-backend.exp b/test/rlhc.d/case/atoi1_cs.cs-A-T0--var-backend.exp
index 1bed9782..1bed9782 100644
--- a/test/cases/rlhc.d/case/atoi1_cs.cs-A-T0--var-backend.exp
+++ b/test/rlhc.d/case/atoi1_cs.cs-A-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_cs.cs-A-T0--var-backend.in b/test/rlhc.d/case/atoi1_cs.cs-A-T0--var-backend.in
index ec254249..ec254249 100644
--- a/test/cases/rlhc.d/case/atoi1_cs.cs-A-T0--var-backend.in
+++ b/test/rlhc.d/case/atoi1_cs.cs-A-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_cs.cs-A-T1--goto-backend.exp b/test/rlhc.d/case/atoi1_cs.cs-A-T1--goto-backend.exp
index b412d4ce..b412d4ce 100644
--- a/test/cases/rlhc.d/case/atoi1_cs.cs-A-T1--goto-backend.exp
+++ b/test/rlhc.d/case/atoi1_cs.cs-A-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_cs.cs-A-T1--goto-backend.in b/test/rlhc.d/case/atoi1_cs.cs-A-T1--goto-backend.in
index b87fb875..b87fb875 100644
--- a/test/cases/rlhc.d/case/atoi1_cs.cs-A-T1--goto-backend.in
+++ b/test/rlhc.d/case/atoi1_cs.cs-A-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_cs.cs-A-T1--var-backend.exp b/test/rlhc.d/case/atoi1_cs.cs-A-T1--var-backend.exp
index a1138ef8..a1138ef8 100644
--- a/test/cases/rlhc.d/case/atoi1_cs.cs-A-T1--var-backend.exp
+++ b/test/rlhc.d/case/atoi1_cs.cs-A-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_cs.cs-A-T1--var-backend.in b/test/rlhc.d/case/atoi1_cs.cs-A-T1--var-backend.in
index 2eb80aab..2eb80aab 100644
--- a/test/cases/rlhc.d/case/atoi1_cs.cs-A-T1--var-backend.in
+++ b/test/rlhc.d/case/atoi1_cs.cs-A-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_go.go-Z-F0--goto-backend.exp b/test/rlhc.d/case/atoi1_go.go-Z-F0--goto-backend.exp
index 7db94ebb..7db94ebb 100644
--- a/test/cases/rlhc.d/case/atoi1_go.go-Z-F0--goto-backend.exp
+++ b/test/rlhc.d/case/atoi1_go.go-Z-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_go.go-Z-F0--goto-backend.in b/test/rlhc.d/case/atoi1_go.go-Z-F0--goto-backend.in
index 552d7161..552d7161 100644
--- a/test/cases/rlhc.d/case/atoi1_go.go-Z-F0--goto-backend.in
+++ b/test/rlhc.d/case/atoi1_go.go-Z-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_go.go-Z-F0--var-backend.exp b/test/rlhc.d/case/atoi1_go.go-Z-F0--var-backend.exp
index eed817d4..eed817d4 100644
--- a/test/cases/rlhc.d/case/atoi1_go.go-Z-F0--var-backend.exp
+++ b/test/rlhc.d/case/atoi1_go.go-Z-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_go.go-Z-F0--var-backend.in b/test/rlhc.d/case/atoi1_go.go-Z-F0--var-backend.in
index 36acb02f..36acb02f 100644
--- a/test/cases/rlhc.d/case/atoi1_go.go-Z-F0--var-backend.in
+++ b/test/rlhc.d/case/atoi1_go.go-Z-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_go.go-Z-F1--goto-backend.exp b/test/rlhc.d/case/atoi1_go.go-Z-F1--goto-backend.exp
index d9721c43..d9721c43 100644
--- a/test/cases/rlhc.d/case/atoi1_go.go-Z-F1--goto-backend.exp
+++ b/test/rlhc.d/case/atoi1_go.go-Z-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_go.go-Z-F1--goto-backend.in b/test/rlhc.d/case/atoi1_go.go-Z-F1--goto-backend.in
index 2f3f832e..2f3f832e 100644
--- a/test/cases/rlhc.d/case/atoi1_go.go-Z-F1--goto-backend.in
+++ b/test/rlhc.d/case/atoi1_go.go-Z-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_go.go-Z-F1--var-backend.exp b/test/rlhc.d/case/atoi1_go.go-Z-F1--var-backend.exp
index 84e5cba5..84e5cba5 100644
--- a/test/cases/rlhc.d/case/atoi1_go.go-Z-F1--var-backend.exp
+++ b/test/rlhc.d/case/atoi1_go.go-Z-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_go.go-Z-F1--var-backend.in b/test/rlhc.d/case/atoi1_go.go-Z-F1--var-backend.in
index 160dea23..160dea23 100644
--- a/test/cases/rlhc.d/case/atoi1_go.go-Z-F1--var-backend.in
+++ b/test/rlhc.d/case/atoi1_go.go-Z-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_go.go-Z-G0--goto-backend.exp b/test/rlhc.d/case/atoi1_go.go-Z-G0--goto-backend.exp
index 455cbc6f..455cbc6f 100644
--- a/test/cases/rlhc.d/case/atoi1_go.go-Z-G0--goto-backend.exp
+++ b/test/rlhc.d/case/atoi1_go.go-Z-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_go.go-Z-G0--goto-backend.in b/test/rlhc.d/case/atoi1_go.go-Z-G0--goto-backend.in
index 1bf50435..1bf50435 100644
--- a/test/cases/rlhc.d/case/atoi1_go.go-Z-G0--goto-backend.in
+++ b/test/rlhc.d/case/atoi1_go.go-Z-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_go.go-Z-G1--goto-backend.exp b/test/rlhc.d/case/atoi1_go.go-Z-G1--goto-backend.exp
index 9d02ca49..9d02ca49 100644
--- a/test/cases/rlhc.d/case/atoi1_go.go-Z-G1--goto-backend.exp
+++ b/test/rlhc.d/case/atoi1_go.go-Z-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_go.go-Z-G1--goto-backend.in b/test/rlhc.d/case/atoi1_go.go-Z-G1--goto-backend.in
index 1acb7636..1acb7636 100644
--- a/test/cases/rlhc.d/case/atoi1_go.go-Z-G1--goto-backend.in
+++ b/test/rlhc.d/case/atoi1_go.go-Z-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_go.go-Z-G2--goto-backend.exp b/test/rlhc.d/case/atoi1_go.go-Z-G2--goto-backend.exp
index 936aa460..936aa460 100644
--- a/test/cases/rlhc.d/case/atoi1_go.go-Z-G2--goto-backend.exp
+++ b/test/rlhc.d/case/atoi1_go.go-Z-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_go.go-Z-G2--goto-backend.in b/test/rlhc.d/case/atoi1_go.go-Z-G2--goto-backend.in
index c6abc3d3..c6abc3d3 100644
--- a/test/cases/rlhc.d/case/atoi1_go.go-Z-G2--goto-backend.in
+++ b/test/rlhc.d/case/atoi1_go.go-Z-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_go.go-Z-T0--goto-backend.exp b/test/rlhc.d/case/atoi1_go.go-Z-T0--goto-backend.exp
index 3cab8ae2..3cab8ae2 100644
--- a/test/cases/rlhc.d/case/atoi1_go.go-Z-T0--goto-backend.exp
+++ b/test/rlhc.d/case/atoi1_go.go-Z-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_go.go-Z-T0--goto-backend.in b/test/rlhc.d/case/atoi1_go.go-Z-T0--goto-backend.in
index 66b89225..66b89225 100644
--- a/test/cases/rlhc.d/case/atoi1_go.go-Z-T0--goto-backend.in
+++ b/test/rlhc.d/case/atoi1_go.go-Z-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_go.go-Z-T0--var-backend.exp b/test/rlhc.d/case/atoi1_go.go-Z-T0--var-backend.exp
index 1a3d1b80..1a3d1b80 100644
--- a/test/cases/rlhc.d/case/atoi1_go.go-Z-T0--var-backend.exp
+++ b/test/rlhc.d/case/atoi1_go.go-Z-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_go.go-Z-T0--var-backend.in b/test/rlhc.d/case/atoi1_go.go-Z-T0--var-backend.in
index 1c6891bd..1c6891bd 100644
--- a/test/cases/rlhc.d/case/atoi1_go.go-Z-T0--var-backend.in
+++ b/test/rlhc.d/case/atoi1_go.go-Z-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_go.go-Z-T1--goto-backend.exp b/test/rlhc.d/case/atoi1_go.go-Z-T1--goto-backend.exp
index ea637083..ea637083 100644
--- a/test/cases/rlhc.d/case/atoi1_go.go-Z-T1--goto-backend.exp
+++ b/test/rlhc.d/case/atoi1_go.go-Z-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_go.go-Z-T1--goto-backend.in b/test/rlhc.d/case/atoi1_go.go-Z-T1--goto-backend.in
index f9cc6f17..f9cc6f17 100644
--- a/test/cases/rlhc.d/case/atoi1_go.go-Z-T1--goto-backend.in
+++ b/test/rlhc.d/case/atoi1_go.go-Z-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_go.go-Z-T1--var-backend.exp b/test/rlhc.d/case/atoi1_go.go-Z-T1--var-backend.exp
index 7451e641..7451e641 100644
--- a/test/cases/rlhc.d/case/atoi1_go.go-Z-T1--var-backend.exp
+++ b/test/rlhc.d/case/atoi1_go.go-Z-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_go.go-Z-T1--var-backend.in b/test/rlhc.d/case/atoi1_go.go-Z-T1--var-backend.in
index 4a499067..4a499067 100644
--- a/test/cases/rlhc.d/case/atoi1_go.go-Z-T1--var-backend.in
+++ b/test/rlhc.d/case/atoi1_go.go-Z-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_java.java-J-F0--goto-backend.exp b/test/rlhc.d/case/atoi1_java.java-J-F0--goto-backend.exp
index dd28f96b..dd28f96b 100644
--- a/test/cases/rlhc.d/case/atoi1_java.java-J-F0--goto-backend.exp
+++ b/test/rlhc.d/case/atoi1_java.java-J-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_java.java-J-F0--goto-backend.in b/test/rlhc.d/case/atoi1_java.java-J-F0--goto-backend.in
index e3c2be5e..e3c2be5e 100644
--- a/test/cases/rlhc.d/case/atoi1_java.java-J-F0--goto-backend.in
+++ b/test/rlhc.d/case/atoi1_java.java-J-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_java.java-J-F0--var-backend.exp b/test/rlhc.d/case/atoi1_java.java-J-F0--var-backend.exp
index d2ced57f..d2ced57f 100644
--- a/test/cases/rlhc.d/case/atoi1_java.java-J-F0--var-backend.exp
+++ b/test/rlhc.d/case/atoi1_java.java-J-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_java.java-J-F0--var-backend.in b/test/rlhc.d/case/atoi1_java.java-J-F0--var-backend.in
index 41c4bbc1..41c4bbc1 100644
--- a/test/cases/rlhc.d/case/atoi1_java.java-J-F0--var-backend.in
+++ b/test/rlhc.d/case/atoi1_java.java-J-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_java.java-J-F1--goto-backend.exp b/test/rlhc.d/case/atoi1_java.java-J-F1--goto-backend.exp
index e5ca6b6e..e5ca6b6e 100644
--- a/test/cases/rlhc.d/case/atoi1_java.java-J-F1--goto-backend.exp
+++ b/test/rlhc.d/case/atoi1_java.java-J-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_java.java-J-F1--goto-backend.in b/test/rlhc.d/case/atoi1_java.java-J-F1--goto-backend.in
index 43156076..43156076 100644
--- a/test/cases/rlhc.d/case/atoi1_java.java-J-F1--goto-backend.in
+++ b/test/rlhc.d/case/atoi1_java.java-J-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_java.java-J-F1--var-backend.exp b/test/rlhc.d/case/atoi1_java.java-J-F1--var-backend.exp
index bad0feb7..bad0feb7 100644
--- a/test/cases/rlhc.d/case/atoi1_java.java-J-F1--var-backend.exp
+++ b/test/rlhc.d/case/atoi1_java.java-J-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_java.java-J-F1--var-backend.in b/test/rlhc.d/case/atoi1_java.java-J-F1--var-backend.in
index 07ae1a74..07ae1a74 100644
--- a/test/cases/rlhc.d/case/atoi1_java.java-J-F1--var-backend.in
+++ b/test/rlhc.d/case/atoi1_java.java-J-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_java.java-J-T0--goto-backend.exp b/test/rlhc.d/case/atoi1_java.java-J-T0--goto-backend.exp
index 00519d8f..00519d8f 100644
--- a/test/cases/rlhc.d/case/atoi1_java.java-J-T0--goto-backend.exp
+++ b/test/rlhc.d/case/atoi1_java.java-J-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_java.java-J-T0--goto-backend.in b/test/rlhc.d/case/atoi1_java.java-J-T0--goto-backend.in
index 5e54c1ce..5e54c1ce 100644
--- a/test/cases/rlhc.d/case/atoi1_java.java-J-T0--goto-backend.in
+++ b/test/rlhc.d/case/atoi1_java.java-J-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_java.java-J-T0--var-backend.exp b/test/rlhc.d/case/atoi1_java.java-J-T0--var-backend.exp
index 0bc4364e..0bc4364e 100644
--- a/test/cases/rlhc.d/case/atoi1_java.java-J-T0--var-backend.exp
+++ b/test/rlhc.d/case/atoi1_java.java-J-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_java.java-J-T0--var-backend.in b/test/rlhc.d/case/atoi1_java.java-J-T0--var-backend.in
index 84c72ebf..84c72ebf 100644
--- a/test/cases/rlhc.d/case/atoi1_java.java-J-T0--var-backend.in
+++ b/test/rlhc.d/case/atoi1_java.java-J-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_java.java-J-T1--goto-backend.exp b/test/rlhc.d/case/atoi1_java.java-J-T1--goto-backend.exp
index 759e6dde..759e6dde 100644
--- a/test/cases/rlhc.d/case/atoi1_java.java-J-T1--goto-backend.exp
+++ b/test/rlhc.d/case/atoi1_java.java-J-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_java.java-J-T1--goto-backend.in b/test/rlhc.d/case/atoi1_java.java-J-T1--goto-backend.in
index 3f60ed23..3f60ed23 100644
--- a/test/cases/rlhc.d/case/atoi1_java.java-J-T1--goto-backend.in
+++ b/test/rlhc.d/case/atoi1_java.java-J-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_java.java-J-T1--var-backend.exp b/test/rlhc.d/case/atoi1_java.java-J-T1--var-backend.exp
index 4faa2000..4faa2000 100644
--- a/test/cases/rlhc.d/case/atoi1_java.java-J-T1--var-backend.exp
+++ b/test/rlhc.d/case/atoi1_java.java-J-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_java.java-J-T1--var-backend.in b/test/rlhc.d/case/atoi1_java.java-J-T1--var-backend.in
index 47583981..47583981 100644
--- a/test/cases/rlhc.d/case/atoi1_java.java-J-T1--var-backend.in
+++ b/test/rlhc.d/case/atoi1_java.java-J-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_julia.jl-Y-F0--var-backend.exp b/test/rlhc.d/case/atoi1_julia.jl-Y-F0--var-backend.exp
index 4a8dad27..4a8dad27 100644
--- a/test/cases/rlhc.d/case/atoi1_julia.jl-Y-F0--var-backend.exp
+++ b/test/rlhc.d/case/atoi1_julia.jl-Y-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_julia.jl-Y-F0--var-backend.in b/test/rlhc.d/case/atoi1_julia.jl-Y-F0--var-backend.in
index 87425042..87425042 100644
--- a/test/cases/rlhc.d/case/atoi1_julia.jl-Y-F0--var-backend.in
+++ b/test/rlhc.d/case/atoi1_julia.jl-Y-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_julia.jl-Y-F1--var-backend.exp b/test/rlhc.d/case/atoi1_julia.jl-Y-F1--var-backend.exp
index ae149985..ae149985 100644
--- a/test/cases/rlhc.d/case/atoi1_julia.jl-Y-F1--var-backend.exp
+++ b/test/rlhc.d/case/atoi1_julia.jl-Y-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_julia.jl-Y-F1--var-backend.in b/test/rlhc.d/case/atoi1_julia.jl-Y-F1--var-backend.in
index 9fda6212..9fda6212 100644
--- a/test/cases/rlhc.d/case/atoi1_julia.jl-Y-F1--var-backend.in
+++ b/test/rlhc.d/case/atoi1_julia.jl-Y-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_julia.jl-Y-T0--var-backend.exp b/test/rlhc.d/case/atoi1_julia.jl-Y-T0--var-backend.exp
index 5fdde76a..5fdde76a 100644
--- a/test/cases/rlhc.d/case/atoi1_julia.jl-Y-T0--var-backend.exp
+++ b/test/rlhc.d/case/atoi1_julia.jl-Y-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_julia.jl-Y-T0--var-backend.in b/test/rlhc.d/case/atoi1_julia.jl-Y-T0--var-backend.in
index f0d0f602..f0d0f602 100644
--- a/test/cases/rlhc.d/case/atoi1_julia.jl-Y-T0--var-backend.in
+++ b/test/rlhc.d/case/atoi1_julia.jl-Y-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_julia.jl-Y-T1--var-backend.exp b/test/rlhc.d/case/atoi1_julia.jl-Y-T1--var-backend.exp
index 13eb142c..13eb142c 100644
--- a/test/cases/rlhc.d/case/atoi1_julia.jl-Y-T1--var-backend.exp
+++ b/test/rlhc.d/case/atoi1_julia.jl-Y-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_julia.jl-Y-T1--var-backend.in b/test/rlhc.d/case/atoi1_julia.jl-Y-T1--var-backend.in
index bbf041cb..bbf041cb 100644
--- a/test/cases/rlhc.d/case/atoi1_julia.jl-Y-T1--var-backend.in
+++ b/test/rlhc.d/case/atoi1_julia.jl-Y-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_ocaml.ml-O-F0--var-backend.exp b/test/rlhc.d/case/atoi1_ocaml.ml-O-F0--var-backend.exp
index 1309522a..1309522a 100644
--- a/test/cases/rlhc.d/case/atoi1_ocaml.ml-O-F0--var-backend.exp
+++ b/test/rlhc.d/case/atoi1_ocaml.ml-O-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_ocaml.ml-O-F0--var-backend.in b/test/rlhc.d/case/atoi1_ocaml.ml-O-F0--var-backend.in
index 4bf9c3b0..4bf9c3b0 100644
--- a/test/cases/rlhc.d/case/atoi1_ocaml.ml-O-F0--var-backend.in
+++ b/test/rlhc.d/case/atoi1_ocaml.ml-O-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_ocaml.ml-O-F1--var-backend.exp b/test/rlhc.d/case/atoi1_ocaml.ml-O-F1--var-backend.exp
index ca8a8504..ca8a8504 100644
--- a/test/cases/rlhc.d/case/atoi1_ocaml.ml-O-F1--var-backend.exp
+++ b/test/rlhc.d/case/atoi1_ocaml.ml-O-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_ocaml.ml-O-F1--var-backend.in b/test/rlhc.d/case/atoi1_ocaml.ml-O-F1--var-backend.in
index c1ecf336..c1ecf336 100644
--- a/test/cases/rlhc.d/case/atoi1_ocaml.ml-O-F1--var-backend.in
+++ b/test/rlhc.d/case/atoi1_ocaml.ml-O-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_ocaml.ml-O-T0--var-backend.exp b/test/rlhc.d/case/atoi1_ocaml.ml-O-T0--var-backend.exp
index 55532408..55532408 100644
--- a/test/cases/rlhc.d/case/atoi1_ocaml.ml-O-T0--var-backend.exp
+++ b/test/rlhc.d/case/atoi1_ocaml.ml-O-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_ocaml.ml-O-T0--var-backend.in b/test/rlhc.d/case/atoi1_ocaml.ml-O-T0--var-backend.in
index 204f9914..204f9914 100644
--- a/test/cases/rlhc.d/case/atoi1_ocaml.ml-O-T0--var-backend.in
+++ b/test/rlhc.d/case/atoi1_ocaml.ml-O-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_ocaml.ml-O-T1--var-backend.exp b/test/rlhc.d/case/atoi1_ocaml.ml-O-T1--var-backend.exp
index f73c84cc..f73c84cc 100644
--- a/test/cases/rlhc.d/case/atoi1_ocaml.ml-O-T1--var-backend.exp
+++ b/test/rlhc.d/case/atoi1_ocaml.ml-O-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_ocaml.ml-O-T1--var-backend.in b/test/rlhc.d/case/atoi1_ocaml.ml-O-T1--var-backend.in
index cf992b4c..cf992b4c 100644
--- a/test/cases/rlhc.d/case/atoi1_ocaml.ml-O-T1--var-backend.in
+++ b/test/rlhc.d/case/atoi1_ocaml.ml-O-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_ruby.rb-R-F0--var-backend.exp b/test/rlhc.d/case/atoi1_ruby.rb-R-F0--var-backend.exp
index 6100e382..6100e382 100644
--- a/test/cases/rlhc.d/case/atoi1_ruby.rb-R-F0--var-backend.exp
+++ b/test/rlhc.d/case/atoi1_ruby.rb-R-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_ruby.rb-R-F0--var-backend.in b/test/rlhc.d/case/atoi1_ruby.rb-R-F0--var-backend.in
index 6345a539..6345a539 100644
--- a/test/cases/rlhc.d/case/atoi1_ruby.rb-R-F0--var-backend.in
+++ b/test/rlhc.d/case/atoi1_ruby.rb-R-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_ruby.rb-R-F1--var-backend.exp b/test/rlhc.d/case/atoi1_ruby.rb-R-F1--var-backend.exp
index fea5f018..fea5f018 100644
--- a/test/cases/rlhc.d/case/atoi1_ruby.rb-R-F1--var-backend.exp
+++ b/test/rlhc.d/case/atoi1_ruby.rb-R-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_ruby.rb-R-F1--var-backend.in b/test/rlhc.d/case/atoi1_ruby.rb-R-F1--var-backend.in
index ba24bc73..ba24bc73 100644
--- a/test/cases/rlhc.d/case/atoi1_ruby.rb-R-F1--var-backend.in
+++ b/test/rlhc.d/case/atoi1_ruby.rb-R-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_ruby.rb-R-T0--var-backend.exp b/test/rlhc.d/case/atoi1_ruby.rb-R-T0--var-backend.exp
index 531a3add..531a3add 100644
--- a/test/cases/rlhc.d/case/atoi1_ruby.rb-R-T0--var-backend.exp
+++ b/test/rlhc.d/case/atoi1_ruby.rb-R-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_ruby.rb-R-T0--var-backend.in b/test/rlhc.d/case/atoi1_ruby.rb-R-T0--var-backend.in
index 3ec89d7f..3ec89d7f 100644
--- a/test/cases/rlhc.d/case/atoi1_ruby.rb-R-T0--var-backend.in
+++ b/test/rlhc.d/case/atoi1_ruby.rb-R-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_ruby.rb-R-T1--var-backend.exp b/test/rlhc.d/case/atoi1_ruby.rb-R-T1--var-backend.exp
index f1e7c8c4..f1e7c8c4 100644
--- a/test/cases/rlhc.d/case/atoi1_ruby.rb-R-T1--var-backend.exp
+++ b/test/rlhc.d/case/atoi1_ruby.rb-R-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_ruby.rb-R-T1--var-backend.in b/test/rlhc.d/case/atoi1_ruby.rb-R-T1--var-backend.in
index 50763d77..50763d77 100644
--- a/test/cases/rlhc.d/case/atoi1_ruby.rb-R-T1--var-backend.in
+++ b/test/rlhc.d/case/atoi1_ruby.rb-R-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_rust.rs-U-F0--var-backend.exp b/test/rlhc.d/case/atoi1_rust.rs-U-F0--var-backend.exp
index 3b3e3f60..3b3e3f60 100644
--- a/test/cases/rlhc.d/case/atoi1_rust.rs-U-F0--var-backend.exp
+++ b/test/rlhc.d/case/atoi1_rust.rs-U-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_rust.rs-U-F0--var-backend.in b/test/rlhc.d/case/atoi1_rust.rs-U-F0--var-backend.in
index 3b557eae..3b557eae 100644
--- a/test/cases/rlhc.d/case/atoi1_rust.rs-U-F0--var-backend.in
+++ b/test/rlhc.d/case/atoi1_rust.rs-U-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_rust.rs-U-F1--var-backend.exp b/test/rlhc.d/case/atoi1_rust.rs-U-F1--var-backend.exp
index 3312b7cb..3312b7cb 100644
--- a/test/cases/rlhc.d/case/atoi1_rust.rs-U-F1--var-backend.exp
+++ b/test/rlhc.d/case/atoi1_rust.rs-U-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_rust.rs-U-F1--var-backend.in b/test/rlhc.d/case/atoi1_rust.rs-U-F1--var-backend.in
index 34013124..34013124 100644
--- a/test/cases/rlhc.d/case/atoi1_rust.rs-U-F1--var-backend.in
+++ b/test/rlhc.d/case/atoi1_rust.rs-U-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_rust.rs-U-T0--var-backend.exp b/test/rlhc.d/case/atoi1_rust.rs-U-T0--var-backend.exp
index a8c1f0ea..a8c1f0ea 100644
--- a/test/cases/rlhc.d/case/atoi1_rust.rs-U-T0--var-backend.exp
+++ b/test/rlhc.d/case/atoi1_rust.rs-U-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_rust.rs-U-T0--var-backend.in b/test/rlhc.d/case/atoi1_rust.rs-U-T0--var-backend.in
index 3fb88ffa..3fb88ffa 100644
--- a/test/cases/rlhc.d/case/atoi1_rust.rs-U-T0--var-backend.in
+++ b/test/rlhc.d/case/atoi1_rust.rs-U-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi1_rust.rs-U-T1--var-backend.exp b/test/rlhc.d/case/atoi1_rust.rs-U-T1--var-backend.exp
index 1ee66a1c..1ee66a1c 100644
--- a/test/cases/rlhc.d/case/atoi1_rust.rs-U-T1--var-backend.exp
+++ b/test/rlhc.d/case/atoi1_rust.rs-U-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi1_rust.rs-U-T1--var-backend.in b/test/rlhc.d/case/atoi1_rust.rs-U-T1--var-backend.in
index 6885f454..6885f454 100644
--- a/test/cases/rlhc.d/case/atoi1_rust.rs-U-T1--var-backend.in
+++ b/test/rlhc.d/case/atoi1_rust.rs-U-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_c.c-C-F0--goto-backend.exp b/test/rlhc.d/case/atoi2_c.c-C-F0--goto-backend.exp
index 30eadb34..30eadb34 100644
--- a/test/cases/rlhc.d/case/atoi2_c.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/atoi2_c.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_c.c-C-F0--goto-backend.in b/test/rlhc.d/case/atoi2_c.c-C-F0--goto-backend.in
index 1f8cad31..1f8cad31 100644
--- a/test/cases/rlhc.d/case/atoi2_c.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/atoi2_c.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_c.c-C-F0--var-backend.exp b/test/rlhc.d/case/atoi2_c.c-C-F0--var-backend.exp
index 68823321..68823321 100644
--- a/test/cases/rlhc.d/case/atoi2_c.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/atoi2_c.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_c.c-C-F0--var-backend.in b/test/rlhc.d/case/atoi2_c.c-C-F0--var-backend.in
index bad6b1b1..bad6b1b1 100644
--- a/test/cases/rlhc.d/case/atoi2_c.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/atoi2_c.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_c.c-C-F1--goto-backend.exp b/test/rlhc.d/case/atoi2_c.c-C-F1--goto-backend.exp
index 078383e5..078383e5 100644
--- a/test/cases/rlhc.d/case/atoi2_c.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/atoi2_c.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_c.c-C-F1--goto-backend.in b/test/rlhc.d/case/atoi2_c.c-C-F1--goto-backend.in
index 4048cbd6..4048cbd6 100644
--- a/test/cases/rlhc.d/case/atoi2_c.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/atoi2_c.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_c.c-C-F1--var-backend.exp b/test/rlhc.d/case/atoi2_c.c-C-F1--var-backend.exp
index 1f826bad..1f826bad 100644
--- a/test/cases/rlhc.d/case/atoi2_c.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/atoi2_c.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_c.c-C-F1--var-backend.in b/test/rlhc.d/case/atoi2_c.c-C-F1--var-backend.in
index a20a3800..a20a3800 100644
--- a/test/cases/rlhc.d/case/atoi2_c.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/atoi2_c.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_c.c-C-G0--goto-backend.exp b/test/rlhc.d/case/atoi2_c.c-C-G0--goto-backend.exp
index 065cb154..065cb154 100644
--- a/test/cases/rlhc.d/case/atoi2_c.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/atoi2_c.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_c.c-C-G0--goto-backend.in b/test/rlhc.d/case/atoi2_c.c-C-G0--goto-backend.in
index 47782a2c..47782a2c 100644
--- a/test/cases/rlhc.d/case/atoi2_c.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/atoi2_c.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_c.c-C-G1--goto-backend.exp b/test/rlhc.d/case/atoi2_c.c-C-G1--goto-backend.exp
index e3db9930..e3db9930 100644
--- a/test/cases/rlhc.d/case/atoi2_c.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/atoi2_c.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_c.c-C-G1--goto-backend.in b/test/rlhc.d/case/atoi2_c.c-C-G1--goto-backend.in
index 0aed0ec6..0aed0ec6 100644
--- a/test/cases/rlhc.d/case/atoi2_c.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/atoi2_c.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_c.c-C-G2--goto-backend.exp b/test/rlhc.d/case/atoi2_c.c-C-G2--goto-backend.exp
index 3599c559..3599c559 100644
--- a/test/cases/rlhc.d/case/atoi2_c.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/atoi2_c.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_c.c-C-G2--goto-backend.in b/test/rlhc.d/case/atoi2_c.c-C-G2--goto-backend.in
index 1198481e..1198481e 100644
--- a/test/cases/rlhc.d/case/atoi2_c.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/atoi2_c.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_c.c-C-T0--goto-backend.exp b/test/rlhc.d/case/atoi2_c.c-C-T0--goto-backend.exp
index c0946e3e..c0946e3e 100644
--- a/test/cases/rlhc.d/case/atoi2_c.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/atoi2_c.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_c.c-C-T0--goto-backend.in b/test/rlhc.d/case/atoi2_c.c-C-T0--goto-backend.in
index 8ddd6d96..8ddd6d96 100644
--- a/test/cases/rlhc.d/case/atoi2_c.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/atoi2_c.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_c.c-C-T0--var-backend.exp b/test/rlhc.d/case/atoi2_c.c-C-T0--var-backend.exp
index 9a14e2e4..9a14e2e4 100644
--- a/test/cases/rlhc.d/case/atoi2_c.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/atoi2_c.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_c.c-C-T0--var-backend.in b/test/rlhc.d/case/atoi2_c.c-C-T0--var-backend.in
index 021f00d9..021f00d9 100644
--- a/test/cases/rlhc.d/case/atoi2_c.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/atoi2_c.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_c.c-C-T1--goto-backend.exp b/test/rlhc.d/case/atoi2_c.c-C-T1--goto-backend.exp
index 56eb49ea..56eb49ea 100644
--- a/test/cases/rlhc.d/case/atoi2_c.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/atoi2_c.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_c.c-C-T1--goto-backend.in b/test/rlhc.d/case/atoi2_c.c-C-T1--goto-backend.in
index 795b829d..795b829d 100644
--- a/test/cases/rlhc.d/case/atoi2_c.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/atoi2_c.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_c.c-C-T1--var-backend.exp b/test/rlhc.d/case/atoi2_c.c-C-T1--var-backend.exp
index ac4dcc72..ac4dcc72 100644
--- a/test/cases/rlhc.d/case/atoi2_c.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/atoi2_c.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_c.c-C-T1--var-backend.in b/test/rlhc.d/case/atoi2_c.c-C-T1--var-backend.in
index 6e0a0e8b..6e0a0e8b 100644
--- a/test/cases/rlhc.d/case/atoi2_c.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/atoi2_c.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_crack.crk-K-F0--var-backend.exp b/test/rlhc.d/case/atoi2_crack.crk-K-F0--var-backend.exp
index f3053f9c..f3053f9c 100644
--- a/test/cases/rlhc.d/case/atoi2_crack.crk-K-F0--var-backend.exp
+++ b/test/rlhc.d/case/atoi2_crack.crk-K-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_crack.crk-K-F0--var-backend.in b/test/rlhc.d/case/atoi2_crack.crk-K-F0--var-backend.in
index a88e7d8a..a88e7d8a 100644
--- a/test/cases/rlhc.d/case/atoi2_crack.crk-K-F0--var-backend.in
+++ b/test/rlhc.d/case/atoi2_crack.crk-K-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_crack.crk-K-F1--var-backend.exp b/test/rlhc.d/case/atoi2_crack.crk-K-F1--var-backend.exp
index 6e6015ef..6e6015ef 100644
--- a/test/cases/rlhc.d/case/atoi2_crack.crk-K-F1--var-backend.exp
+++ b/test/rlhc.d/case/atoi2_crack.crk-K-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_crack.crk-K-F1--var-backend.in b/test/rlhc.d/case/atoi2_crack.crk-K-F1--var-backend.in
index 4cdd4e63..4cdd4e63 100644
--- a/test/cases/rlhc.d/case/atoi2_crack.crk-K-F1--var-backend.in
+++ b/test/rlhc.d/case/atoi2_crack.crk-K-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_crack.crk-K-T0--var-backend.exp b/test/rlhc.d/case/atoi2_crack.crk-K-T0--var-backend.exp
index 1b19af6c..1b19af6c 100644
--- a/test/cases/rlhc.d/case/atoi2_crack.crk-K-T0--var-backend.exp
+++ b/test/rlhc.d/case/atoi2_crack.crk-K-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_crack.crk-K-T0--var-backend.in b/test/rlhc.d/case/atoi2_crack.crk-K-T0--var-backend.in
index f56a30bf..f56a30bf 100644
--- a/test/cases/rlhc.d/case/atoi2_crack.crk-K-T0--var-backend.in
+++ b/test/rlhc.d/case/atoi2_crack.crk-K-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_crack.crk-K-T1--var-backend.exp b/test/rlhc.d/case/atoi2_crack.crk-K-T1--var-backend.exp
index 0489cdbe..0489cdbe 100644
--- a/test/cases/rlhc.d/case/atoi2_crack.crk-K-T1--var-backend.exp
+++ b/test/rlhc.d/case/atoi2_crack.crk-K-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_crack.crk-K-T1--var-backend.in b/test/rlhc.d/case/atoi2_crack.crk-K-T1--var-backend.in
index 113c7689..113c7689 100644
--- a/test/cases/rlhc.d/case/atoi2_crack.crk-K-T1--var-backend.in
+++ b/test/rlhc.d/case/atoi2_crack.crk-K-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_cs.cs-A-F0--goto-backend.exp b/test/rlhc.d/case/atoi2_cs.cs-A-F0--goto-backend.exp
index f97ebacf..f97ebacf 100644
--- a/test/cases/rlhc.d/case/atoi2_cs.cs-A-F0--goto-backend.exp
+++ b/test/rlhc.d/case/atoi2_cs.cs-A-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_cs.cs-A-F0--goto-backend.in b/test/rlhc.d/case/atoi2_cs.cs-A-F0--goto-backend.in
index 73f94d0d..73f94d0d 100644
--- a/test/cases/rlhc.d/case/atoi2_cs.cs-A-F0--goto-backend.in
+++ b/test/rlhc.d/case/atoi2_cs.cs-A-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_cs.cs-A-F0--var-backend.exp b/test/rlhc.d/case/atoi2_cs.cs-A-F0--var-backend.exp
index d237c896..d237c896 100644
--- a/test/cases/rlhc.d/case/atoi2_cs.cs-A-F0--var-backend.exp
+++ b/test/rlhc.d/case/atoi2_cs.cs-A-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_cs.cs-A-F0--var-backend.in b/test/rlhc.d/case/atoi2_cs.cs-A-F0--var-backend.in
index 92e43d50..92e43d50 100644
--- a/test/cases/rlhc.d/case/atoi2_cs.cs-A-F0--var-backend.in
+++ b/test/rlhc.d/case/atoi2_cs.cs-A-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_cs.cs-A-F1--goto-backend.exp b/test/rlhc.d/case/atoi2_cs.cs-A-F1--goto-backend.exp
index 118b2693..118b2693 100644
--- a/test/cases/rlhc.d/case/atoi2_cs.cs-A-F1--goto-backend.exp
+++ b/test/rlhc.d/case/atoi2_cs.cs-A-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_cs.cs-A-F1--goto-backend.in b/test/rlhc.d/case/atoi2_cs.cs-A-F1--goto-backend.in
index 91d19e59..91d19e59 100644
--- a/test/cases/rlhc.d/case/atoi2_cs.cs-A-F1--goto-backend.in
+++ b/test/rlhc.d/case/atoi2_cs.cs-A-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_cs.cs-A-F1--var-backend.exp b/test/rlhc.d/case/atoi2_cs.cs-A-F1--var-backend.exp
index 10635c29..10635c29 100644
--- a/test/cases/rlhc.d/case/atoi2_cs.cs-A-F1--var-backend.exp
+++ b/test/rlhc.d/case/atoi2_cs.cs-A-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_cs.cs-A-F1--var-backend.in b/test/rlhc.d/case/atoi2_cs.cs-A-F1--var-backend.in
index 592cbfe4..592cbfe4 100644
--- a/test/cases/rlhc.d/case/atoi2_cs.cs-A-F1--var-backend.in
+++ b/test/rlhc.d/case/atoi2_cs.cs-A-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_cs.cs-A-G0--goto-backend.exp b/test/rlhc.d/case/atoi2_cs.cs-A-G0--goto-backend.exp
index e6061f60..e6061f60 100644
--- a/test/cases/rlhc.d/case/atoi2_cs.cs-A-G0--goto-backend.exp
+++ b/test/rlhc.d/case/atoi2_cs.cs-A-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_cs.cs-A-G0--goto-backend.in b/test/rlhc.d/case/atoi2_cs.cs-A-G0--goto-backend.in
index afcc4a2a..afcc4a2a 100644
--- a/test/cases/rlhc.d/case/atoi2_cs.cs-A-G0--goto-backend.in
+++ b/test/rlhc.d/case/atoi2_cs.cs-A-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_cs.cs-A-G1--goto-backend.exp b/test/rlhc.d/case/atoi2_cs.cs-A-G1--goto-backend.exp
index 05c0d5f4..05c0d5f4 100644
--- a/test/cases/rlhc.d/case/atoi2_cs.cs-A-G1--goto-backend.exp
+++ b/test/rlhc.d/case/atoi2_cs.cs-A-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_cs.cs-A-G1--goto-backend.in b/test/rlhc.d/case/atoi2_cs.cs-A-G1--goto-backend.in
index 3a31f570..3a31f570 100644
--- a/test/cases/rlhc.d/case/atoi2_cs.cs-A-G1--goto-backend.in
+++ b/test/rlhc.d/case/atoi2_cs.cs-A-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_cs.cs-A-T0--goto-backend.exp b/test/rlhc.d/case/atoi2_cs.cs-A-T0--goto-backend.exp
index 67d8cc2b..67d8cc2b 100644
--- a/test/cases/rlhc.d/case/atoi2_cs.cs-A-T0--goto-backend.exp
+++ b/test/rlhc.d/case/atoi2_cs.cs-A-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_cs.cs-A-T0--goto-backend.in b/test/rlhc.d/case/atoi2_cs.cs-A-T0--goto-backend.in
index 7ab81017..7ab81017 100644
--- a/test/cases/rlhc.d/case/atoi2_cs.cs-A-T0--goto-backend.in
+++ b/test/rlhc.d/case/atoi2_cs.cs-A-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_cs.cs-A-T0--var-backend.exp b/test/rlhc.d/case/atoi2_cs.cs-A-T0--var-backend.exp
index 86733167..86733167 100644
--- a/test/cases/rlhc.d/case/atoi2_cs.cs-A-T0--var-backend.exp
+++ b/test/rlhc.d/case/atoi2_cs.cs-A-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_cs.cs-A-T0--var-backend.in b/test/rlhc.d/case/atoi2_cs.cs-A-T0--var-backend.in
index 3b54fe62..3b54fe62 100644
--- a/test/cases/rlhc.d/case/atoi2_cs.cs-A-T0--var-backend.in
+++ b/test/rlhc.d/case/atoi2_cs.cs-A-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_cs.cs-A-T1--goto-backend.exp b/test/rlhc.d/case/atoi2_cs.cs-A-T1--goto-backend.exp
index 873d9b38..873d9b38 100644
--- a/test/cases/rlhc.d/case/atoi2_cs.cs-A-T1--goto-backend.exp
+++ b/test/rlhc.d/case/atoi2_cs.cs-A-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_cs.cs-A-T1--goto-backend.in b/test/rlhc.d/case/atoi2_cs.cs-A-T1--goto-backend.in
index 56f0dd1f..56f0dd1f 100644
--- a/test/cases/rlhc.d/case/atoi2_cs.cs-A-T1--goto-backend.in
+++ b/test/rlhc.d/case/atoi2_cs.cs-A-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_cs.cs-A-T1--var-backend.exp b/test/rlhc.d/case/atoi2_cs.cs-A-T1--var-backend.exp
index d7795dc9..d7795dc9 100644
--- a/test/cases/rlhc.d/case/atoi2_cs.cs-A-T1--var-backend.exp
+++ b/test/rlhc.d/case/atoi2_cs.cs-A-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_cs.cs-A-T1--var-backend.in b/test/rlhc.d/case/atoi2_cs.cs-A-T1--var-backend.in
index a04eda09..a04eda09 100644
--- a/test/cases/rlhc.d/case/atoi2_cs.cs-A-T1--var-backend.in
+++ b/test/rlhc.d/case/atoi2_cs.cs-A-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_go.go-Z-F0--goto-backend.exp b/test/rlhc.d/case/atoi2_go.go-Z-F0--goto-backend.exp
index e50a1393..e50a1393 100644
--- a/test/cases/rlhc.d/case/atoi2_go.go-Z-F0--goto-backend.exp
+++ b/test/rlhc.d/case/atoi2_go.go-Z-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_go.go-Z-F0--goto-backend.in b/test/rlhc.d/case/atoi2_go.go-Z-F0--goto-backend.in
index dca8ccf7..dca8ccf7 100644
--- a/test/cases/rlhc.d/case/atoi2_go.go-Z-F0--goto-backend.in
+++ b/test/rlhc.d/case/atoi2_go.go-Z-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_go.go-Z-F0--var-backend.exp b/test/rlhc.d/case/atoi2_go.go-Z-F0--var-backend.exp
index 9a5e5825..9a5e5825 100644
--- a/test/cases/rlhc.d/case/atoi2_go.go-Z-F0--var-backend.exp
+++ b/test/rlhc.d/case/atoi2_go.go-Z-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_go.go-Z-F0--var-backend.in b/test/rlhc.d/case/atoi2_go.go-Z-F0--var-backend.in
index bf5bc4e1..bf5bc4e1 100644
--- a/test/cases/rlhc.d/case/atoi2_go.go-Z-F0--var-backend.in
+++ b/test/rlhc.d/case/atoi2_go.go-Z-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_go.go-Z-F1--goto-backend.exp b/test/rlhc.d/case/atoi2_go.go-Z-F1--goto-backend.exp
index 57cca7a4..57cca7a4 100644
--- a/test/cases/rlhc.d/case/atoi2_go.go-Z-F1--goto-backend.exp
+++ b/test/rlhc.d/case/atoi2_go.go-Z-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_go.go-Z-F1--goto-backend.in b/test/rlhc.d/case/atoi2_go.go-Z-F1--goto-backend.in
index a0123ad8..a0123ad8 100644
--- a/test/cases/rlhc.d/case/atoi2_go.go-Z-F1--goto-backend.in
+++ b/test/rlhc.d/case/atoi2_go.go-Z-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_go.go-Z-F1--var-backend.exp b/test/rlhc.d/case/atoi2_go.go-Z-F1--var-backend.exp
index 742b4c3a..742b4c3a 100644
--- a/test/cases/rlhc.d/case/atoi2_go.go-Z-F1--var-backend.exp
+++ b/test/rlhc.d/case/atoi2_go.go-Z-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_go.go-Z-F1--var-backend.in b/test/rlhc.d/case/atoi2_go.go-Z-F1--var-backend.in
index cc4174e1..cc4174e1 100644
--- a/test/cases/rlhc.d/case/atoi2_go.go-Z-F1--var-backend.in
+++ b/test/rlhc.d/case/atoi2_go.go-Z-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_go.go-Z-G0--goto-backend.exp b/test/rlhc.d/case/atoi2_go.go-Z-G0--goto-backend.exp
index 314e54db..314e54db 100644
--- a/test/cases/rlhc.d/case/atoi2_go.go-Z-G0--goto-backend.exp
+++ b/test/rlhc.d/case/atoi2_go.go-Z-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_go.go-Z-G0--goto-backend.in b/test/rlhc.d/case/atoi2_go.go-Z-G0--goto-backend.in
index 46203c45..46203c45 100644
--- a/test/cases/rlhc.d/case/atoi2_go.go-Z-G0--goto-backend.in
+++ b/test/rlhc.d/case/atoi2_go.go-Z-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_go.go-Z-G1--goto-backend.exp b/test/rlhc.d/case/atoi2_go.go-Z-G1--goto-backend.exp
index 961a34a7..961a34a7 100644
--- a/test/cases/rlhc.d/case/atoi2_go.go-Z-G1--goto-backend.exp
+++ b/test/rlhc.d/case/atoi2_go.go-Z-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_go.go-Z-G1--goto-backend.in b/test/rlhc.d/case/atoi2_go.go-Z-G1--goto-backend.in
index 761c4811..761c4811 100644
--- a/test/cases/rlhc.d/case/atoi2_go.go-Z-G1--goto-backend.in
+++ b/test/rlhc.d/case/atoi2_go.go-Z-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_go.go-Z-G2--goto-backend.exp b/test/rlhc.d/case/atoi2_go.go-Z-G2--goto-backend.exp
index b4b3a5bd..b4b3a5bd 100644
--- a/test/cases/rlhc.d/case/atoi2_go.go-Z-G2--goto-backend.exp
+++ b/test/rlhc.d/case/atoi2_go.go-Z-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_go.go-Z-G2--goto-backend.in b/test/rlhc.d/case/atoi2_go.go-Z-G2--goto-backend.in
index aa12a77b..aa12a77b 100644
--- a/test/cases/rlhc.d/case/atoi2_go.go-Z-G2--goto-backend.in
+++ b/test/rlhc.d/case/atoi2_go.go-Z-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_go.go-Z-T0--goto-backend.exp b/test/rlhc.d/case/atoi2_go.go-Z-T0--goto-backend.exp
index 3b044a2c..3b044a2c 100644
--- a/test/cases/rlhc.d/case/atoi2_go.go-Z-T0--goto-backend.exp
+++ b/test/rlhc.d/case/atoi2_go.go-Z-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_go.go-Z-T0--goto-backend.in b/test/rlhc.d/case/atoi2_go.go-Z-T0--goto-backend.in
index 34796497..34796497 100644
--- a/test/cases/rlhc.d/case/atoi2_go.go-Z-T0--goto-backend.in
+++ b/test/rlhc.d/case/atoi2_go.go-Z-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_go.go-Z-T0--var-backend.exp b/test/rlhc.d/case/atoi2_go.go-Z-T0--var-backend.exp
index dfe71736..dfe71736 100644
--- a/test/cases/rlhc.d/case/atoi2_go.go-Z-T0--var-backend.exp
+++ b/test/rlhc.d/case/atoi2_go.go-Z-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_go.go-Z-T0--var-backend.in b/test/rlhc.d/case/atoi2_go.go-Z-T0--var-backend.in
index 11d8b036..11d8b036 100644
--- a/test/cases/rlhc.d/case/atoi2_go.go-Z-T0--var-backend.in
+++ b/test/rlhc.d/case/atoi2_go.go-Z-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_go.go-Z-T1--goto-backend.exp b/test/rlhc.d/case/atoi2_go.go-Z-T1--goto-backend.exp
index 2b9d4a7d..2b9d4a7d 100644
--- a/test/cases/rlhc.d/case/atoi2_go.go-Z-T1--goto-backend.exp
+++ b/test/rlhc.d/case/atoi2_go.go-Z-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_go.go-Z-T1--goto-backend.in b/test/rlhc.d/case/atoi2_go.go-Z-T1--goto-backend.in
index ac06e36b..ac06e36b 100644
--- a/test/cases/rlhc.d/case/atoi2_go.go-Z-T1--goto-backend.in
+++ b/test/rlhc.d/case/atoi2_go.go-Z-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_go.go-Z-T1--var-backend.exp b/test/rlhc.d/case/atoi2_go.go-Z-T1--var-backend.exp
index 32aec756..32aec756 100644
--- a/test/cases/rlhc.d/case/atoi2_go.go-Z-T1--var-backend.exp
+++ b/test/rlhc.d/case/atoi2_go.go-Z-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_go.go-Z-T1--var-backend.in b/test/rlhc.d/case/atoi2_go.go-Z-T1--var-backend.in
index dc6a3431..dc6a3431 100644
--- a/test/cases/rlhc.d/case/atoi2_go.go-Z-T1--var-backend.in
+++ b/test/rlhc.d/case/atoi2_go.go-Z-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_java.java-J-F0--goto-backend.exp b/test/rlhc.d/case/atoi2_java.java-J-F0--goto-backend.exp
index 0e29ae4d..0e29ae4d 100644
--- a/test/cases/rlhc.d/case/atoi2_java.java-J-F0--goto-backend.exp
+++ b/test/rlhc.d/case/atoi2_java.java-J-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_java.java-J-F0--goto-backend.in b/test/rlhc.d/case/atoi2_java.java-J-F0--goto-backend.in
index f1a252ef..f1a252ef 100644
--- a/test/cases/rlhc.d/case/atoi2_java.java-J-F0--goto-backend.in
+++ b/test/rlhc.d/case/atoi2_java.java-J-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_java.java-J-F0--var-backend.exp b/test/rlhc.d/case/atoi2_java.java-J-F0--var-backend.exp
index 4920d05a..4920d05a 100644
--- a/test/cases/rlhc.d/case/atoi2_java.java-J-F0--var-backend.exp
+++ b/test/rlhc.d/case/atoi2_java.java-J-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_java.java-J-F0--var-backend.in b/test/rlhc.d/case/atoi2_java.java-J-F0--var-backend.in
index 6f58985b..6f58985b 100644
--- a/test/cases/rlhc.d/case/atoi2_java.java-J-F0--var-backend.in
+++ b/test/rlhc.d/case/atoi2_java.java-J-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_java.java-J-F1--goto-backend.exp b/test/rlhc.d/case/atoi2_java.java-J-F1--goto-backend.exp
index 55db56fc..55db56fc 100644
--- a/test/cases/rlhc.d/case/atoi2_java.java-J-F1--goto-backend.exp
+++ b/test/rlhc.d/case/atoi2_java.java-J-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_java.java-J-F1--goto-backend.in b/test/rlhc.d/case/atoi2_java.java-J-F1--goto-backend.in
index 99e51b79..99e51b79 100644
--- a/test/cases/rlhc.d/case/atoi2_java.java-J-F1--goto-backend.in
+++ b/test/rlhc.d/case/atoi2_java.java-J-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_java.java-J-F1--var-backend.exp b/test/rlhc.d/case/atoi2_java.java-J-F1--var-backend.exp
index 770a56a8..770a56a8 100644
--- a/test/cases/rlhc.d/case/atoi2_java.java-J-F1--var-backend.exp
+++ b/test/rlhc.d/case/atoi2_java.java-J-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_java.java-J-F1--var-backend.in b/test/rlhc.d/case/atoi2_java.java-J-F1--var-backend.in
index ebba6dab..ebba6dab 100644
--- a/test/cases/rlhc.d/case/atoi2_java.java-J-F1--var-backend.in
+++ b/test/rlhc.d/case/atoi2_java.java-J-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_java.java-J-T0--goto-backend.exp b/test/rlhc.d/case/atoi2_java.java-J-T0--goto-backend.exp
index 3aafc3d6..3aafc3d6 100644
--- a/test/cases/rlhc.d/case/atoi2_java.java-J-T0--goto-backend.exp
+++ b/test/rlhc.d/case/atoi2_java.java-J-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_java.java-J-T0--goto-backend.in b/test/rlhc.d/case/atoi2_java.java-J-T0--goto-backend.in
index 13f6d5d6..13f6d5d6 100644
--- a/test/cases/rlhc.d/case/atoi2_java.java-J-T0--goto-backend.in
+++ b/test/rlhc.d/case/atoi2_java.java-J-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_java.java-J-T0--var-backend.exp b/test/rlhc.d/case/atoi2_java.java-J-T0--var-backend.exp
index 183e34fa..183e34fa 100644
--- a/test/cases/rlhc.d/case/atoi2_java.java-J-T0--var-backend.exp
+++ b/test/rlhc.d/case/atoi2_java.java-J-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_java.java-J-T0--var-backend.in b/test/rlhc.d/case/atoi2_java.java-J-T0--var-backend.in
index cd9d0a1a..cd9d0a1a 100644
--- a/test/cases/rlhc.d/case/atoi2_java.java-J-T0--var-backend.in
+++ b/test/rlhc.d/case/atoi2_java.java-J-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_java.java-J-T1--goto-backend.exp b/test/rlhc.d/case/atoi2_java.java-J-T1--goto-backend.exp
index ae09d140..ae09d140 100644
--- a/test/cases/rlhc.d/case/atoi2_java.java-J-T1--goto-backend.exp
+++ b/test/rlhc.d/case/atoi2_java.java-J-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_java.java-J-T1--goto-backend.in b/test/rlhc.d/case/atoi2_java.java-J-T1--goto-backend.in
index e4a12d88..e4a12d88 100644
--- a/test/cases/rlhc.d/case/atoi2_java.java-J-T1--goto-backend.in
+++ b/test/rlhc.d/case/atoi2_java.java-J-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_java.java-J-T1--var-backend.exp b/test/rlhc.d/case/atoi2_java.java-J-T1--var-backend.exp
index e80ef36c..e80ef36c 100644
--- a/test/cases/rlhc.d/case/atoi2_java.java-J-T1--var-backend.exp
+++ b/test/rlhc.d/case/atoi2_java.java-J-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_java.java-J-T1--var-backend.in b/test/rlhc.d/case/atoi2_java.java-J-T1--var-backend.in
index 0010b01e..0010b01e 100644
--- a/test/cases/rlhc.d/case/atoi2_java.java-J-T1--var-backend.in
+++ b/test/rlhc.d/case/atoi2_java.java-J-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_julia.jl-Y-F0--var-backend.exp b/test/rlhc.d/case/atoi2_julia.jl-Y-F0--var-backend.exp
index 75625387..75625387 100644
--- a/test/cases/rlhc.d/case/atoi2_julia.jl-Y-F0--var-backend.exp
+++ b/test/rlhc.d/case/atoi2_julia.jl-Y-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_julia.jl-Y-F0--var-backend.in b/test/rlhc.d/case/atoi2_julia.jl-Y-F0--var-backend.in
index cb938d10..cb938d10 100644
--- a/test/cases/rlhc.d/case/atoi2_julia.jl-Y-F0--var-backend.in
+++ b/test/rlhc.d/case/atoi2_julia.jl-Y-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_julia.jl-Y-F1--var-backend.exp b/test/rlhc.d/case/atoi2_julia.jl-Y-F1--var-backend.exp
index c02840a5..c02840a5 100644
--- a/test/cases/rlhc.d/case/atoi2_julia.jl-Y-F1--var-backend.exp
+++ b/test/rlhc.d/case/atoi2_julia.jl-Y-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_julia.jl-Y-F1--var-backend.in b/test/rlhc.d/case/atoi2_julia.jl-Y-F1--var-backend.in
index 5c6446e2..5c6446e2 100644
--- a/test/cases/rlhc.d/case/atoi2_julia.jl-Y-F1--var-backend.in
+++ b/test/rlhc.d/case/atoi2_julia.jl-Y-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_julia.jl-Y-T0--var-backend.exp b/test/rlhc.d/case/atoi2_julia.jl-Y-T0--var-backend.exp
index e8839c0c..e8839c0c 100644
--- a/test/cases/rlhc.d/case/atoi2_julia.jl-Y-T0--var-backend.exp
+++ b/test/rlhc.d/case/atoi2_julia.jl-Y-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_julia.jl-Y-T0--var-backend.in b/test/rlhc.d/case/atoi2_julia.jl-Y-T0--var-backend.in
index e0de5b8f..e0de5b8f 100644
--- a/test/cases/rlhc.d/case/atoi2_julia.jl-Y-T0--var-backend.in
+++ b/test/rlhc.d/case/atoi2_julia.jl-Y-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_julia.jl-Y-T1--var-backend.exp b/test/rlhc.d/case/atoi2_julia.jl-Y-T1--var-backend.exp
index a1d3b207..a1d3b207 100644
--- a/test/cases/rlhc.d/case/atoi2_julia.jl-Y-T1--var-backend.exp
+++ b/test/rlhc.d/case/atoi2_julia.jl-Y-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_julia.jl-Y-T1--var-backend.in b/test/rlhc.d/case/atoi2_julia.jl-Y-T1--var-backend.in
index 648987cf..648987cf 100644
--- a/test/cases/rlhc.d/case/atoi2_julia.jl-Y-T1--var-backend.in
+++ b/test/rlhc.d/case/atoi2_julia.jl-Y-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_ocaml.ml-O-F0--var-backend.exp b/test/rlhc.d/case/atoi2_ocaml.ml-O-F0--var-backend.exp
index 0f88f2ca..0f88f2ca 100644
--- a/test/cases/rlhc.d/case/atoi2_ocaml.ml-O-F0--var-backend.exp
+++ b/test/rlhc.d/case/atoi2_ocaml.ml-O-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_ocaml.ml-O-F0--var-backend.in b/test/rlhc.d/case/atoi2_ocaml.ml-O-F0--var-backend.in
index 370c5c2b..370c5c2b 100644
--- a/test/cases/rlhc.d/case/atoi2_ocaml.ml-O-F0--var-backend.in
+++ b/test/rlhc.d/case/atoi2_ocaml.ml-O-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_ocaml.ml-O-F1--var-backend.exp b/test/rlhc.d/case/atoi2_ocaml.ml-O-F1--var-backend.exp
index 4a496897..4a496897 100644
--- a/test/cases/rlhc.d/case/atoi2_ocaml.ml-O-F1--var-backend.exp
+++ b/test/rlhc.d/case/atoi2_ocaml.ml-O-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_ocaml.ml-O-F1--var-backend.in b/test/rlhc.d/case/atoi2_ocaml.ml-O-F1--var-backend.in
index bc8b8f3a..bc8b8f3a 100644
--- a/test/cases/rlhc.d/case/atoi2_ocaml.ml-O-F1--var-backend.in
+++ b/test/rlhc.d/case/atoi2_ocaml.ml-O-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_ocaml.ml-O-T0--var-backend.exp b/test/rlhc.d/case/atoi2_ocaml.ml-O-T0--var-backend.exp
index de22ece2..de22ece2 100644
--- a/test/cases/rlhc.d/case/atoi2_ocaml.ml-O-T0--var-backend.exp
+++ b/test/rlhc.d/case/atoi2_ocaml.ml-O-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_ocaml.ml-O-T0--var-backend.in b/test/rlhc.d/case/atoi2_ocaml.ml-O-T0--var-backend.in
index 220ea90f..220ea90f 100644
--- a/test/cases/rlhc.d/case/atoi2_ocaml.ml-O-T0--var-backend.in
+++ b/test/rlhc.d/case/atoi2_ocaml.ml-O-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_ocaml.ml-O-T1--var-backend.exp b/test/rlhc.d/case/atoi2_ocaml.ml-O-T1--var-backend.exp
index 291d6a6b..291d6a6b 100644
--- a/test/cases/rlhc.d/case/atoi2_ocaml.ml-O-T1--var-backend.exp
+++ b/test/rlhc.d/case/atoi2_ocaml.ml-O-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_ocaml.ml-O-T1--var-backend.in b/test/rlhc.d/case/atoi2_ocaml.ml-O-T1--var-backend.in
index 866b0a02..866b0a02 100644
--- a/test/cases/rlhc.d/case/atoi2_ocaml.ml-O-T1--var-backend.in
+++ b/test/rlhc.d/case/atoi2_ocaml.ml-O-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_ruby.rb-R-F0--var-backend.exp b/test/rlhc.d/case/atoi2_ruby.rb-R-F0--var-backend.exp
index 9a7fff73..9a7fff73 100644
--- a/test/cases/rlhc.d/case/atoi2_ruby.rb-R-F0--var-backend.exp
+++ b/test/rlhc.d/case/atoi2_ruby.rb-R-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_ruby.rb-R-F0--var-backend.in b/test/rlhc.d/case/atoi2_ruby.rb-R-F0--var-backend.in
index d68196eb..d68196eb 100644
--- a/test/cases/rlhc.d/case/atoi2_ruby.rb-R-F0--var-backend.in
+++ b/test/rlhc.d/case/atoi2_ruby.rb-R-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_ruby.rb-R-F1--var-backend.exp b/test/rlhc.d/case/atoi2_ruby.rb-R-F1--var-backend.exp
index 189ab691..189ab691 100644
--- a/test/cases/rlhc.d/case/atoi2_ruby.rb-R-F1--var-backend.exp
+++ b/test/rlhc.d/case/atoi2_ruby.rb-R-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_ruby.rb-R-F1--var-backend.in b/test/rlhc.d/case/atoi2_ruby.rb-R-F1--var-backend.in
index 97b14104..97b14104 100644
--- a/test/cases/rlhc.d/case/atoi2_ruby.rb-R-F1--var-backend.in
+++ b/test/rlhc.d/case/atoi2_ruby.rb-R-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_ruby.rb-R-T0--var-backend.exp b/test/rlhc.d/case/atoi2_ruby.rb-R-T0--var-backend.exp
index 5c374cbe..5c374cbe 100644
--- a/test/cases/rlhc.d/case/atoi2_ruby.rb-R-T0--var-backend.exp
+++ b/test/rlhc.d/case/atoi2_ruby.rb-R-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_ruby.rb-R-T0--var-backend.in b/test/rlhc.d/case/atoi2_ruby.rb-R-T0--var-backend.in
index 802e6997..802e6997 100644
--- a/test/cases/rlhc.d/case/atoi2_ruby.rb-R-T0--var-backend.in
+++ b/test/rlhc.d/case/atoi2_ruby.rb-R-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_ruby.rb-R-T1--var-backend.exp b/test/rlhc.d/case/atoi2_ruby.rb-R-T1--var-backend.exp
index e6eee500..e6eee500 100644
--- a/test/cases/rlhc.d/case/atoi2_ruby.rb-R-T1--var-backend.exp
+++ b/test/rlhc.d/case/atoi2_ruby.rb-R-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_ruby.rb-R-T1--var-backend.in b/test/rlhc.d/case/atoi2_ruby.rb-R-T1--var-backend.in
index 329bf7e8..329bf7e8 100644
--- a/test/cases/rlhc.d/case/atoi2_ruby.rb-R-T1--var-backend.in
+++ b/test/rlhc.d/case/atoi2_ruby.rb-R-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_rust.rs-U-F0--var-backend.exp b/test/rlhc.d/case/atoi2_rust.rs-U-F0--var-backend.exp
index 608a371c..608a371c 100644
--- a/test/cases/rlhc.d/case/atoi2_rust.rs-U-F0--var-backend.exp
+++ b/test/rlhc.d/case/atoi2_rust.rs-U-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_rust.rs-U-F0--var-backend.in b/test/rlhc.d/case/atoi2_rust.rs-U-F0--var-backend.in
index 3f50e042..3f50e042 100644
--- a/test/cases/rlhc.d/case/atoi2_rust.rs-U-F0--var-backend.in
+++ b/test/rlhc.d/case/atoi2_rust.rs-U-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_rust.rs-U-F1--var-backend.exp b/test/rlhc.d/case/atoi2_rust.rs-U-F1--var-backend.exp
index d3988599..d3988599 100644
--- a/test/cases/rlhc.d/case/atoi2_rust.rs-U-F1--var-backend.exp
+++ b/test/rlhc.d/case/atoi2_rust.rs-U-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_rust.rs-U-F1--var-backend.in b/test/rlhc.d/case/atoi2_rust.rs-U-F1--var-backend.in
index 26b75fc5..26b75fc5 100644
--- a/test/cases/rlhc.d/case/atoi2_rust.rs-U-F1--var-backend.in
+++ b/test/rlhc.d/case/atoi2_rust.rs-U-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_rust.rs-U-T0--var-backend.exp b/test/rlhc.d/case/atoi2_rust.rs-U-T0--var-backend.exp
index 75103610..75103610 100644
--- a/test/cases/rlhc.d/case/atoi2_rust.rs-U-T0--var-backend.exp
+++ b/test/rlhc.d/case/atoi2_rust.rs-U-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_rust.rs-U-T0--var-backend.in b/test/rlhc.d/case/atoi2_rust.rs-U-T0--var-backend.in
index 83d68bb1..83d68bb1 100644
--- a/test/cases/rlhc.d/case/atoi2_rust.rs-U-T0--var-backend.in
+++ b/test/rlhc.d/case/atoi2_rust.rs-U-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi2_rust.rs-U-T1--var-backend.exp b/test/rlhc.d/case/atoi2_rust.rs-U-T1--var-backend.exp
index fc7ed57d..fc7ed57d 100644
--- a/test/cases/rlhc.d/case/atoi2_rust.rs-U-T1--var-backend.exp
+++ b/test/rlhc.d/case/atoi2_rust.rs-U-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi2_rust.rs-U-T1--var-backend.in b/test/rlhc.d/case/atoi2_rust.rs-U-T1--var-backend.in
index 642cdf45..642cdf45 100644
--- a/test/cases/rlhc.d/case/atoi2_rust.rs-U-T1--var-backend.in
+++ b/test/rlhc.d/case/atoi2_rust.rs-U-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi3.rb-R-F0--var-backend.exp b/test/rlhc.d/case/atoi3.rb-R-F0--var-backend.exp
index 39dad2fe..39dad2fe 100644
--- a/test/cases/rlhc.d/case/atoi3.rb-R-F0--var-backend.exp
+++ b/test/rlhc.d/case/atoi3.rb-R-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi3.rb-R-F0--var-backend.in b/test/rlhc.d/case/atoi3.rb-R-F0--var-backend.in
index 63592c6f..63592c6f 100644
--- a/test/cases/rlhc.d/case/atoi3.rb-R-F0--var-backend.in
+++ b/test/rlhc.d/case/atoi3.rb-R-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi3.rb-R-F1--var-backend.exp b/test/rlhc.d/case/atoi3.rb-R-F1--var-backend.exp
index 49ea3006..49ea3006 100644
--- a/test/cases/rlhc.d/case/atoi3.rb-R-F1--var-backend.exp
+++ b/test/rlhc.d/case/atoi3.rb-R-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi3.rb-R-F1--var-backend.in b/test/rlhc.d/case/atoi3.rb-R-F1--var-backend.in
index 3b599324..3b599324 100644
--- a/test/cases/rlhc.d/case/atoi3.rb-R-F1--var-backend.in
+++ b/test/rlhc.d/case/atoi3.rb-R-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi3.rb-R-T0--var-backend.exp b/test/rlhc.d/case/atoi3.rb-R-T0--var-backend.exp
index 25bcfb10..25bcfb10 100644
--- a/test/cases/rlhc.d/case/atoi3.rb-R-T0--var-backend.exp
+++ b/test/rlhc.d/case/atoi3.rb-R-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi3.rb-R-T0--var-backend.in b/test/rlhc.d/case/atoi3.rb-R-T0--var-backend.in
index 16508f59..16508f59 100644
--- a/test/cases/rlhc.d/case/atoi3.rb-R-T0--var-backend.in
+++ b/test/rlhc.d/case/atoi3.rb-R-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi3.rb-R-T1--var-backend.exp b/test/rlhc.d/case/atoi3.rb-R-T1--var-backend.exp
index 083d5293..083d5293 100644
--- a/test/cases/rlhc.d/case/atoi3.rb-R-T1--var-backend.exp
+++ b/test/rlhc.d/case/atoi3.rb-R-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi3.rb-R-T1--var-backend.in b/test/rlhc.d/case/atoi3.rb-R-T1--var-backend.in
index 25e34613..25e34613 100644
--- a/test/cases/rlhc.d/case/atoi3.rb-R-T1--var-backend.in
+++ b/test/rlhc.d/case/atoi3.rb-R-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi4.ml-O-F0--var-backend.exp b/test/rlhc.d/case/atoi4.ml-O-F0--var-backend.exp
index 0e20ca70..0e20ca70 100644
--- a/test/cases/rlhc.d/case/atoi4.ml-O-F0--var-backend.exp
+++ b/test/rlhc.d/case/atoi4.ml-O-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi4.ml-O-F0--var-backend.in b/test/rlhc.d/case/atoi4.ml-O-F0--var-backend.in
index baec9897..baec9897 100644
--- a/test/cases/rlhc.d/case/atoi4.ml-O-F0--var-backend.in
+++ b/test/rlhc.d/case/atoi4.ml-O-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi4.ml-O-F1--var-backend.exp b/test/rlhc.d/case/atoi4.ml-O-F1--var-backend.exp
index 6a4aa46a..6a4aa46a 100644
--- a/test/cases/rlhc.d/case/atoi4.ml-O-F1--var-backend.exp
+++ b/test/rlhc.d/case/atoi4.ml-O-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi4.ml-O-F1--var-backend.in b/test/rlhc.d/case/atoi4.ml-O-F1--var-backend.in
index 221b7cb0..221b7cb0 100644
--- a/test/cases/rlhc.d/case/atoi4.ml-O-F1--var-backend.in
+++ b/test/rlhc.d/case/atoi4.ml-O-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi4.ml-O-T0--var-backend.exp b/test/rlhc.d/case/atoi4.ml-O-T0--var-backend.exp
index d8d2c55b..d8d2c55b 100644
--- a/test/cases/rlhc.d/case/atoi4.ml-O-T0--var-backend.exp
+++ b/test/rlhc.d/case/atoi4.ml-O-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi4.ml-O-T0--var-backend.in b/test/rlhc.d/case/atoi4.ml-O-T0--var-backend.in
index 4343b2a8..4343b2a8 100644
--- a/test/cases/rlhc.d/case/atoi4.ml-O-T0--var-backend.in
+++ b/test/rlhc.d/case/atoi4.ml-O-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/atoi4.ml-O-T1--var-backend.exp b/test/rlhc.d/case/atoi4.ml-O-T1--var-backend.exp
index aa8a060a..aa8a060a 100644
--- a/test/cases/rlhc.d/case/atoi4.ml-O-T1--var-backend.exp
+++ b/test/rlhc.d/case/atoi4.ml-O-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/atoi4.ml-O-T1--var-backend.in b/test/rlhc.d/case/atoi4.ml-O-T1--var-backend.in
index 190f9d8c..190f9d8c 100644
--- a/test/cases/rlhc.d/case/atoi4.ml-O-T1--var-backend.in
+++ b/test/rlhc.d/case/atoi4.ml-O-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/awkemu.c-C-F0--goto-backend.exp b/test/rlhc.d/case/awkemu.c-C-F0--goto-backend.exp
index 3597fb88..3597fb88 100644
--- a/test/cases/rlhc.d/case/awkemu.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/awkemu.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/awkemu.c-C-F0--goto-backend.in b/test/rlhc.d/case/awkemu.c-C-F0--goto-backend.in
index a482ba8a..a482ba8a 100644
--- a/test/cases/rlhc.d/case/awkemu.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/awkemu.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/awkemu.c-C-F0--var-backend.exp b/test/rlhc.d/case/awkemu.c-C-F0--var-backend.exp
index 6c3efd92..6c3efd92 100644
--- a/test/cases/rlhc.d/case/awkemu.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/awkemu.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/awkemu.c-C-F0--var-backend.in b/test/rlhc.d/case/awkemu.c-C-F0--var-backend.in
index 36dc4ebf..36dc4ebf 100644
--- a/test/cases/rlhc.d/case/awkemu.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/awkemu.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/awkemu.c-C-F1--goto-backend.exp b/test/rlhc.d/case/awkemu.c-C-F1--goto-backend.exp
index 8ab11635..8ab11635 100644
--- a/test/cases/rlhc.d/case/awkemu.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/awkemu.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/awkemu.c-C-F1--goto-backend.in b/test/rlhc.d/case/awkemu.c-C-F1--goto-backend.in
index e9f2e719..e9f2e719 100644
--- a/test/cases/rlhc.d/case/awkemu.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/awkemu.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/awkemu.c-C-F1--var-backend.exp b/test/rlhc.d/case/awkemu.c-C-F1--var-backend.exp
index 8398d2e9..8398d2e9 100644
--- a/test/cases/rlhc.d/case/awkemu.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/awkemu.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/awkemu.c-C-F1--var-backend.in b/test/rlhc.d/case/awkemu.c-C-F1--var-backend.in
index f5e63b95..f5e63b95 100644
--- a/test/cases/rlhc.d/case/awkemu.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/awkemu.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/awkemu.c-C-G0--goto-backend.exp b/test/rlhc.d/case/awkemu.c-C-G0--goto-backend.exp
index 53fc760c..53fc760c 100644
--- a/test/cases/rlhc.d/case/awkemu.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/awkemu.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/awkemu.c-C-G0--goto-backend.in b/test/rlhc.d/case/awkemu.c-C-G0--goto-backend.in
index aacf190d..aacf190d 100644
--- a/test/cases/rlhc.d/case/awkemu.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/awkemu.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/awkemu.c-C-G1--goto-backend.exp b/test/rlhc.d/case/awkemu.c-C-G1--goto-backend.exp
index c48a8236..c48a8236 100644
--- a/test/cases/rlhc.d/case/awkemu.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/awkemu.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/awkemu.c-C-G1--goto-backend.in b/test/rlhc.d/case/awkemu.c-C-G1--goto-backend.in
index b14a6714..b14a6714 100644
--- a/test/cases/rlhc.d/case/awkemu.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/awkemu.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/awkemu.c-C-G2--goto-backend.exp b/test/rlhc.d/case/awkemu.c-C-G2--goto-backend.exp
index 72a8389b..72a8389b 100644
--- a/test/cases/rlhc.d/case/awkemu.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/awkemu.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/awkemu.c-C-G2--goto-backend.in b/test/rlhc.d/case/awkemu.c-C-G2--goto-backend.in
index 3e7a7503..3e7a7503 100644
--- a/test/cases/rlhc.d/case/awkemu.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/awkemu.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/awkemu.c-C-T0--goto-backend.exp b/test/rlhc.d/case/awkemu.c-C-T0--goto-backend.exp
index f659b0e2..f659b0e2 100644
--- a/test/cases/rlhc.d/case/awkemu.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/awkemu.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/awkemu.c-C-T0--goto-backend.in b/test/rlhc.d/case/awkemu.c-C-T0--goto-backend.in
index c366f1be..c366f1be 100644
--- a/test/cases/rlhc.d/case/awkemu.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/awkemu.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/awkemu.c-C-T0--var-backend.exp b/test/rlhc.d/case/awkemu.c-C-T0--var-backend.exp
index 70cc0127..70cc0127 100644
--- a/test/cases/rlhc.d/case/awkemu.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/awkemu.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/awkemu.c-C-T0--var-backend.in b/test/rlhc.d/case/awkemu.c-C-T0--var-backend.in
index 3f567067..3f567067 100644
--- a/test/cases/rlhc.d/case/awkemu.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/awkemu.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/awkemu.c-C-T1--goto-backend.exp b/test/rlhc.d/case/awkemu.c-C-T1--goto-backend.exp
index cb79635a..cb79635a 100644
--- a/test/cases/rlhc.d/case/awkemu.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/awkemu.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/awkemu.c-C-T1--goto-backend.in b/test/rlhc.d/case/awkemu.c-C-T1--goto-backend.in
index 83ed5b49..83ed5b49 100644
--- a/test/cases/rlhc.d/case/awkemu.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/awkemu.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/awkemu.c-C-T1--var-backend.exp b/test/rlhc.d/case/awkemu.c-C-T1--var-backend.exp
index 438983c6..438983c6 100644
--- a/test/cases/rlhc.d/case/awkemu.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/awkemu.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/awkemu.c-C-T1--var-backend.in b/test/rlhc.d/case/awkemu.c-C-T1--var-backend.in
index 49b66882..49b66882 100644
--- a/test/cases/rlhc.d/case/awkemu.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/awkemu.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/builtin.c-C-F0--goto-backend.exp b/test/rlhc.d/case/builtin.c-C-F0--goto-backend.exp
index ad291216..ad291216 100644
--- a/test/cases/rlhc.d/case/builtin.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/builtin.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/builtin.c-C-F0--goto-backend.in b/test/rlhc.d/case/builtin.c-C-F0--goto-backend.in
index 943e3c31..943e3c31 100644
--- a/test/cases/rlhc.d/case/builtin.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/builtin.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/builtin.c-C-F0--var-backend.exp b/test/rlhc.d/case/builtin.c-C-F0--var-backend.exp
index 763386d3..763386d3 100644
--- a/test/cases/rlhc.d/case/builtin.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/builtin.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/builtin.c-C-F0--var-backend.in b/test/rlhc.d/case/builtin.c-C-F0--var-backend.in
index 35cb7f7a..35cb7f7a 100644
--- a/test/cases/rlhc.d/case/builtin.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/builtin.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/builtin.c-C-F1--goto-backend.exp b/test/rlhc.d/case/builtin.c-C-F1--goto-backend.exp
index 28475e37..28475e37 100644
--- a/test/cases/rlhc.d/case/builtin.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/builtin.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/builtin.c-C-F1--goto-backend.in b/test/rlhc.d/case/builtin.c-C-F1--goto-backend.in
index e3cef31c..e3cef31c 100644
--- a/test/cases/rlhc.d/case/builtin.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/builtin.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/builtin.c-C-F1--var-backend.exp b/test/rlhc.d/case/builtin.c-C-F1--var-backend.exp
index 6e52aa70..6e52aa70 100644
--- a/test/cases/rlhc.d/case/builtin.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/builtin.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/builtin.c-C-F1--var-backend.in b/test/rlhc.d/case/builtin.c-C-F1--var-backend.in
index 9eb60f55..9eb60f55 100644
--- a/test/cases/rlhc.d/case/builtin.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/builtin.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/builtin.c-C-G0--goto-backend.exp b/test/rlhc.d/case/builtin.c-C-G0--goto-backend.exp
index e606454c..e606454c 100644
--- a/test/cases/rlhc.d/case/builtin.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/builtin.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/builtin.c-C-G0--goto-backend.in b/test/rlhc.d/case/builtin.c-C-G0--goto-backend.in
index a103c738..a103c738 100644
--- a/test/cases/rlhc.d/case/builtin.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/builtin.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/builtin.c-C-G1--goto-backend.exp b/test/rlhc.d/case/builtin.c-C-G1--goto-backend.exp
index 940eae7a..940eae7a 100644
--- a/test/cases/rlhc.d/case/builtin.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/builtin.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/builtin.c-C-G1--goto-backend.in b/test/rlhc.d/case/builtin.c-C-G1--goto-backend.in
index 864ae212..864ae212 100644
--- a/test/cases/rlhc.d/case/builtin.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/builtin.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/builtin.c-C-G2--goto-backend.exp b/test/rlhc.d/case/builtin.c-C-G2--goto-backend.exp
index fad6d3ce..fad6d3ce 100644
--- a/test/cases/rlhc.d/case/builtin.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/builtin.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/builtin.c-C-G2--goto-backend.in b/test/rlhc.d/case/builtin.c-C-G2--goto-backend.in
index c480b0e4..c480b0e4 100644
--- a/test/cases/rlhc.d/case/builtin.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/builtin.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/builtin.c-C-T0--goto-backend.exp b/test/rlhc.d/case/builtin.c-C-T0--goto-backend.exp
index 88249a2a..88249a2a 100644
--- a/test/cases/rlhc.d/case/builtin.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/builtin.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/builtin.c-C-T0--goto-backend.in b/test/rlhc.d/case/builtin.c-C-T0--goto-backend.in
index 596f7cc5..596f7cc5 100644
--- a/test/cases/rlhc.d/case/builtin.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/builtin.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/builtin.c-C-T0--var-backend.exp b/test/rlhc.d/case/builtin.c-C-T0--var-backend.exp
index 16c0cd09..16c0cd09 100644
--- a/test/cases/rlhc.d/case/builtin.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/builtin.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/builtin.c-C-T0--var-backend.in b/test/rlhc.d/case/builtin.c-C-T0--var-backend.in
index 6c8fbd91..6c8fbd91 100644
--- a/test/cases/rlhc.d/case/builtin.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/builtin.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/builtin.c-C-T1--goto-backend.exp b/test/rlhc.d/case/builtin.c-C-T1--goto-backend.exp
index 61496555..61496555 100644
--- a/test/cases/rlhc.d/case/builtin.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/builtin.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/builtin.c-C-T1--goto-backend.in b/test/rlhc.d/case/builtin.c-C-T1--goto-backend.in
index 2a7dc7d2..2a7dc7d2 100644
--- a/test/cases/rlhc.d/case/builtin.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/builtin.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/builtin.c-C-T1--var-backend.exp b/test/rlhc.d/case/builtin.c-C-T1--var-backend.exp
index 68df6067..68df6067 100644
--- a/test/cases/rlhc.d/case/builtin.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/builtin.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/builtin.c-C-T1--var-backend.in b/test/rlhc.d/case/builtin.c-C-T1--var-backend.in
index 90e91ec5..90e91ec5 100644
--- a/test/cases/rlhc.d/case/builtin.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/builtin.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/call1.c-C-F0--goto-backend.exp b/test/rlhc.d/case/call1.c-C-F0--goto-backend.exp
index 6fcb03db..6fcb03db 100644
--- a/test/cases/rlhc.d/case/call1.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/call1.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call1.c-C-F0--goto-backend.in b/test/rlhc.d/case/call1.c-C-F0--goto-backend.in
index b61c8d57..b61c8d57 100644
--- a/test/cases/rlhc.d/case/call1.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/call1.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call1.c-C-F1--goto-backend.exp b/test/rlhc.d/case/call1.c-C-F1--goto-backend.exp
index 97d16fde..97d16fde 100644
--- a/test/cases/rlhc.d/case/call1.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/call1.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call1.c-C-F1--goto-backend.in b/test/rlhc.d/case/call1.c-C-F1--goto-backend.in
index 6e54b3e7..6e54b3e7 100644
--- a/test/cases/rlhc.d/case/call1.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/call1.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call1.c-C-G0--goto-backend.exp b/test/rlhc.d/case/call1.c-C-G0--goto-backend.exp
index 515bce71..515bce71 100644
--- a/test/cases/rlhc.d/case/call1.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/call1.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call1.c-C-G0--goto-backend.in b/test/rlhc.d/case/call1.c-C-G0--goto-backend.in
index 317ec45c..317ec45c 100644
--- a/test/cases/rlhc.d/case/call1.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/call1.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call1.c-C-G1--goto-backend.exp b/test/rlhc.d/case/call1.c-C-G1--goto-backend.exp
index 6cdc8626..6cdc8626 100644
--- a/test/cases/rlhc.d/case/call1.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/call1.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call1.c-C-G1--goto-backend.in b/test/rlhc.d/case/call1.c-C-G1--goto-backend.in
index cef6589e..cef6589e 100644
--- a/test/cases/rlhc.d/case/call1.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/call1.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call1.c-C-G2--goto-backend.exp b/test/rlhc.d/case/call1.c-C-G2--goto-backend.exp
index 0a876946..0a876946 100644
--- a/test/cases/rlhc.d/case/call1.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/call1.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call1.c-C-G2--goto-backend.in b/test/rlhc.d/case/call1.c-C-G2--goto-backend.in
index e940c2f5..e940c2f5 100644
--- a/test/cases/rlhc.d/case/call1.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/call1.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call1.c-C-T0--goto-backend.exp b/test/rlhc.d/case/call1.c-C-T0--goto-backend.exp
index cf9e2a48..cf9e2a48 100644
--- a/test/cases/rlhc.d/case/call1.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/call1.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call1.c-C-T0--goto-backend.in b/test/rlhc.d/case/call1.c-C-T0--goto-backend.in
index 875db41f..875db41f 100644
--- a/test/cases/rlhc.d/case/call1.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/call1.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call1.c-C-T1--goto-backend.exp b/test/rlhc.d/case/call1.c-C-T1--goto-backend.exp
index 76f5d921..76f5d921 100644
--- a/test/cases/rlhc.d/case/call1.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/call1.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call1.c-C-T1--goto-backend.in b/test/rlhc.d/case/call1.c-C-T1--goto-backend.in
index 28c85a61..28c85a61 100644
--- a/test/cases/rlhc.d/case/call1.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/call1.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call2.cpp-C-F0--goto-backend.exp b/test/rlhc.d/case/call2.cpp-C-F0--goto-backend.exp
index 998cc8ea..998cc8ea 100644
--- a/test/cases/rlhc.d/case/call2.cpp-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/call2.cpp-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call2.cpp-C-F0--goto-backend.in b/test/rlhc.d/case/call2.cpp-C-F0--goto-backend.in
index e6e8a979..e6e8a979 100644
--- a/test/cases/rlhc.d/case/call2.cpp-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/call2.cpp-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call2.cpp-C-F1--goto-backend.exp b/test/rlhc.d/case/call2.cpp-C-F1--goto-backend.exp
index 78325b5c..78325b5c 100644
--- a/test/cases/rlhc.d/case/call2.cpp-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/call2.cpp-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call2.cpp-C-F1--goto-backend.in b/test/rlhc.d/case/call2.cpp-C-F1--goto-backend.in
index 74973d09..74973d09 100644
--- a/test/cases/rlhc.d/case/call2.cpp-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/call2.cpp-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call2.cpp-C-G0--goto-backend.exp b/test/rlhc.d/case/call2.cpp-C-G0--goto-backend.exp
index 07ad1ea4..07ad1ea4 100644
--- a/test/cases/rlhc.d/case/call2.cpp-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/call2.cpp-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call2.cpp-C-G0--goto-backend.in b/test/rlhc.d/case/call2.cpp-C-G0--goto-backend.in
index 0e57afd1..0e57afd1 100644
--- a/test/cases/rlhc.d/case/call2.cpp-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/call2.cpp-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call2.cpp-C-G1--goto-backend.exp b/test/rlhc.d/case/call2.cpp-C-G1--goto-backend.exp
index 82c48d54..82c48d54 100644
--- a/test/cases/rlhc.d/case/call2.cpp-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/call2.cpp-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call2.cpp-C-G1--goto-backend.in b/test/rlhc.d/case/call2.cpp-C-G1--goto-backend.in
index 64921031..64921031 100644
--- a/test/cases/rlhc.d/case/call2.cpp-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/call2.cpp-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call2.cpp-C-G2--goto-backend.exp b/test/rlhc.d/case/call2.cpp-C-G2--goto-backend.exp
index 97ba4fa6..97ba4fa6 100644
--- a/test/cases/rlhc.d/case/call2.cpp-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/call2.cpp-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call2.cpp-C-G2--goto-backend.in b/test/rlhc.d/case/call2.cpp-C-G2--goto-backend.in
index 918aa743..918aa743 100644
--- a/test/cases/rlhc.d/case/call2.cpp-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/call2.cpp-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call2.cpp-C-T0--goto-backend.exp b/test/rlhc.d/case/call2.cpp-C-T0--goto-backend.exp
index d984cbfc..d984cbfc 100644
--- a/test/cases/rlhc.d/case/call2.cpp-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/call2.cpp-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call2.cpp-C-T0--goto-backend.in b/test/rlhc.d/case/call2.cpp-C-T0--goto-backend.in
index a6dc0fe2..a6dc0fe2 100644
--- a/test/cases/rlhc.d/case/call2.cpp-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/call2.cpp-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call2.cpp-C-T1--goto-backend.exp b/test/rlhc.d/case/call2.cpp-C-T1--goto-backend.exp
index dc5bb1fa..dc5bb1fa 100644
--- a/test/cases/rlhc.d/case/call2.cpp-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/call2.cpp-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call2.cpp-C-T1--goto-backend.in b/test/rlhc.d/case/call2.cpp-C-T1--goto-backend.in
index 4624888f..4624888f 100644
--- a/test/cases/rlhc.d/case/call2.cpp-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/call2.cpp-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call3.m-C-F0--goto-backend.exp b/test/rlhc.d/case/call3.m-C-F0--goto-backend.exp
index b0b91c1a..b0b91c1a 100644
--- a/test/cases/rlhc.d/case/call3.m-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/call3.m-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call3.m-C-F0--goto-backend.in b/test/rlhc.d/case/call3.m-C-F0--goto-backend.in
index 8404ecff..8404ecff 100644
--- a/test/cases/rlhc.d/case/call3.m-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/call3.m-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call3.m-C-F1--goto-backend.exp b/test/rlhc.d/case/call3.m-C-F1--goto-backend.exp
index df7fd776..df7fd776 100644
--- a/test/cases/rlhc.d/case/call3.m-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/call3.m-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call3.m-C-F1--goto-backend.in b/test/rlhc.d/case/call3.m-C-F1--goto-backend.in
index 67269489..67269489 100644
--- a/test/cases/rlhc.d/case/call3.m-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/call3.m-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call3.m-C-G0--goto-backend.exp b/test/rlhc.d/case/call3.m-C-G0--goto-backend.exp
index fe231a9a..fe231a9a 100644
--- a/test/cases/rlhc.d/case/call3.m-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/call3.m-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call3.m-C-G0--goto-backend.in b/test/rlhc.d/case/call3.m-C-G0--goto-backend.in
index ec30a6c7..ec30a6c7 100644
--- a/test/cases/rlhc.d/case/call3.m-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/call3.m-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call3.m-C-G1--goto-backend.exp b/test/rlhc.d/case/call3.m-C-G1--goto-backend.exp
index 3b7912fb..3b7912fb 100644
--- a/test/cases/rlhc.d/case/call3.m-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/call3.m-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call3.m-C-G1--goto-backend.in b/test/rlhc.d/case/call3.m-C-G1--goto-backend.in
index 416f10cf..416f10cf 100644
--- a/test/cases/rlhc.d/case/call3.m-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/call3.m-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call3.m-C-G2--goto-backend.exp b/test/rlhc.d/case/call3.m-C-G2--goto-backend.exp
index b48ccc6c..b48ccc6c 100644
--- a/test/cases/rlhc.d/case/call3.m-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/call3.m-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call3.m-C-G2--goto-backend.in b/test/rlhc.d/case/call3.m-C-G2--goto-backend.in
index 0d500f6c..0d500f6c 100644
--- a/test/cases/rlhc.d/case/call3.m-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/call3.m-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call3.m-C-T0--goto-backend.exp b/test/rlhc.d/case/call3.m-C-T0--goto-backend.exp
index a8983062..a8983062 100644
--- a/test/cases/rlhc.d/case/call3.m-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/call3.m-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call3.m-C-T0--goto-backend.in b/test/rlhc.d/case/call3.m-C-T0--goto-backend.in
index 04e6990e..04e6990e 100644
--- a/test/cases/rlhc.d/case/call3.m-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/call3.m-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call3.m-C-T1--goto-backend.exp b/test/rlhc.d/case/call3.m-C-T1--goto-backend.exp
index 5a5cd678..5a5cd678 100644
--- a/test/cases/rlhc.d/case/call3.m-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/call3.m-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call3.m-C-T1--goto-backend.in b/test/rlhc.d/case/call3.m-C-T1--goto-backend.in
index e40520b3..e40520b3 100644
--- a/test/cases/rlhc.d/case/call3.m-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/call3.m-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call4_c.c-C-F0--goto-backend.exp b/test/rlhc.d/case/call4_c.c-C-F0--goto-backend.exp
index 045edbb4..045edbb4 100644
--- a/test/cases/rlhc.d/case/call4_c.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/call4_c.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call4_c.c-C-F0--goto-backend.in b/test/rlhc.d/case/call4_c.c-C-F0--goto-backend.in
index 1f297e55..1f297e55 100644
--- a/test/cases/rlhc.d/case/call4_c.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/call4_c.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call4_c.c-C-F1--goto-backend.exp b/test/rlhc.d/case/call4_c.c-C-F1--goto-backend.exp
index bc226e23..bc226e23 100644
--- a/test/cases/rlhc.d/case/call4_c.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/call4_c.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call4_c.c-C-F1--goto-backend.in b/test/rlhc.d/case/call4_c.c-C-F1--goto-backend.in
index 35fb36af..35fb36af 100644
--- a/test/cases/rlhc.d/case/call4_c.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/call4_c.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call4_c.c-C-G0--goto-backend.exp b/test/rlhc.d/case/call4_c.c-C-G0--goto-backend.exp
index 88a54949..88a54949 100644
--- a/test/cases/rlhc.d/case/call4_c.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/call4_c.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call4_c.c-C-G0--goto-backend.in b/test/rlhc.d/case/call4_c.c-C-G0--goto-backend.in
index 697044b8..697044b8 100644
--- a/test/cases/rlhc.d/case/call4_c.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/call4_c.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call4_c.c-C-G1--goto-backend.exp b/test/rlhc.d/case/call4_c.c-C-G1--goto-backend.exp
index 8027faa0..8027faa0 100644
--- a/test/cases/rlhc.d/case/call4_c.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/call4_c.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call4_c.c-C-G1--goto-backend.in b/test/rlhc.d/case/call4_c.c-C-G1--goto-backend.in
index 0848cd1c..0848cd1c 100644
--- a/test/cases/rlhc.d/case/call4_c.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/call4_c.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call4_c.c-C-G2--goto-backend.exp b/test/rlhc.d/case/call4_c.c-C-G2--goto-backend.exp
index d8231720..d8231720 100644
--- a/test/cases/rlhc.d/case/call4_c.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/call4_c.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call4_c.c-C-G2--goto-backend.in b/test/rlhc.d/case/call4_c.c-C-G2--goto-backend.in
index 626818ad..626818ad 100644
--- a/test/cases/rlhc.d/case/call4_c.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/call4_c.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call4_c.c-C-T0--goto-backend.exp b/test/rlhc.d/case/call4_c.c-C-T0--goto-backend.exp
index 036cebef..036cebef 100644
--- a/test/cases/rlhc.d/case/call4_c.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/call4_c.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call4_c.c-C-T0--goto-backend.in b/test/rlhc.d/case/call4_c.c-C-T0--goto-backend.in
index 61f00262..61f00262 100644
--- a/test/cases/rlhc.d/case/call4_c.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/call4_c.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call4_c.c-C-T1--goto-backend.exp b/test/rlhc.d/case/call4_c.c-C-T1--goto-backend.exp
index 8ea00829..8ea00829 100644
--- a/test/cases/rlhc.d/case/call4_c.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/call4_c.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call4_c.c-C-T1--goto-backend.in b/test/rlhc.d/case/call4_c.c-C-T1--goto-backend.in
index c9b2ba1c..c9b2ba1c 100644
--- a/test/cases/rlhc.d/case/call4_c.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/call4_c.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call4_cs.cs-A-F0--goto-backend.exp b/test/rlhc.d/case/call4_cs.cs-A-F0--goto-backend.exp
index 86a7bc8a..86a7bc8a 100644
--- a/test/cases/rlhc.d/case/call4_cs.cs-A-F0--goto-backend.exp
+++ b/test/rlhc.d/case/call4_cs.cs-A-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call4_cs.cs-A-F0--goto-backend.in b/test/rlhc.d/case/call4_cs.cs-A-F0--goto-backend.in
index ac2a7d3a..ac2a7d3a 100644
--- a/test/cases/rlhc.d/case/call4_cs.cs-A-F0--goto-backend.in
+++ b/test/rlhc.d/case/call4_cs.cs-A-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call4_cs.cs-A-F1--goto-backend.exp b/test/rlhc.d/case/call4_cs.cs-A-F1--goto-backend.exp
index 62729b73..62729b73 100644
--- a/test/cases/rlhc.d/case/call4_cs.cs-A-F1--goto-backend.exp
+++ b/test/rlhc.d/case/call4_cs.cs-A-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call4_cs.cs-A-F1--goto-backend.in b/test/rlhc.d/case/call4_cs.cs-A-F1--goto-backend.in
index e7e816e6..e7e816e6 100644
--- a/test/cases/rlhc.d/case/call4_cs.cs-A-F1--goto-backend.in
+++ b/test/rlhc.d/case/call4_cs.cs-A-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call4_cs.cs-A-G0--goto-backend.exp b/test/rlhc.d/case/call4_cs.cs-A-G0--goto-backend.exp
index f60e49a4..f60e49a4 100644
--- a/test/cases/rlhc.d/case/call4_cs.cs-A-G0--goto-backend.exp
+++ b/test/rlhc.d/case/call4_cs.cs-A-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call4_cs.cs-A-G0--goto-backend.in b/test/rlhc.d/case/call4_cs.cs-A-G0--goto-backend.in
index 28d2eab4..28d2eab4 100644
--- a/test/cases/rlhc.d/case/call4_cs.cs-A-G0--goto-backend.in
+++ b/test/rlhc.d/case/call4_cs.cs-A-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call4_cs.cs-A-G1--goto-backend.exp b/test/rlhc.d/case/call4_cs.cs-A-G1--goto-backend.exp
index 2eed9ea1..2eed9ea1 100644
--- a/test/cases/rlhc.d/case/call4_cs.cs-A-G1--goto-backend.exp
+++ b/test/rlhc.d/case/call4_cs.cs-A-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call4_cs.cs-A-G1--goto-backend.in b/test/rlhc.d/case/call4_cs.cs-A-G1--goto-backend.in
index a8a8fe5f..a8a8fe5f 100644
--- a/test/cases/rlhc.d/case/call4_cs.cs-A-G1--goto-backend.in
+++ b/test/rlhc.d/case/call4_cs.cs-A-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call4_cs.cs-A-T0--goto-backend.exp b/test/rlhc.d/case/call4_cs.cs-A-T0--goto-backend.exp
index 1380f85b..1380f85b 100644
--- a/test/cases/rlhc.d/case/call4_cs.cs-A-T0--goto-backend.exp
+++ b/test/rlhc.d/case/call4_cs.cs-A-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call4_cs.cs-A-T0--goto-backend.in b/test/rlhc.d/case/call4_cs.cs-A-T0--goto-backend.in
index b848efcf..b848efcf 100644
--- a/test/cases/rlhc.d/case/call4_cs.cs-A-T0--goto-backend.in
+++ b/test/rlhc.d/case/call4_cs.cs-A-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call4_cs.cs-A-T1--goto-backend.exp b/test/rlhc.d/case/call4_cs.cs-A-T1--goto-backend.exp
index 03bca9d5..03bca9d5 100644
--- a/test/cases/rlhc.d/case/call4_cs.cs-A-T1--goto-backend.exp
+++ b/test/rlhc.d/case/call4_cs.cs-A-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call4_cs.cs-A-T1--goto-backend.in b/test/rlhc.d/case/call4_cs.cs-A-T1--goto-backend.in
index 9f40557b..9f40557b 100644
--- a/test/cases/rlhc.d/case/call4_cs.cs-A-T1--goto-backend.in
+++ b/test/rlhc.d/case/call4_cs.cs-A-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call4_go.go-Z-F0--goto-backend.exp b/test/rlhc.d/case/call4_go.go-Z-F0--goto-backend.exp
index 6f13c271..6f13c271 100644
--- a/test/cases/rlhc.d/case/call4_go.go-Z-F0--goto-backend.exp
+++ b/test/rlhc.d/case/call4_go.go-Z-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call4_go.go-Z-F0--goto-backend.in b/test/rlhc.d/case/call4_go.go-Z-F0--goto-backend.in
index 6d24e96a..6d24e96a 100644
--- a/test/cases/rlhc.d/case/call4_go.go-Z-F0--goto-backend.in
+++ b/test/rlhc.d/case/call4_go.go-Z-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call4_go.go-Z-F1--goto-backend.exp b/test/rlhc.d/case/call4_go.go-Z-F1--goto-backend.exp
index efb34970..efb34970 100644
--- a/test/cases/rlhc.d/case/call4_go.go-Z-F1--goto-backend.exp
+++ b/test/rlhc.d/case/call4_go.go-Z-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call4_go.go-Z-F1--goto-backend.in b/test/rlhc.d/case/call4_go.go-Z-F1--goto-backend.in
index 871e3936..871e3936 100644
--- a/test/cases/rlhc.d/case/call4_go.go-Z-F1--goto-backend.in
+++ b/test/rlhc.d/case/call4_go.go-Z-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call4_go.go-Z-G0--goto-backend.exp b/test/rlhc.d/case/call4_go.go-Z-G0--goto-backend.exp
index e493aab9..e493aab9 100644
--- a/test/cases/rlhc.d/case/call4_go.go-Z-G0--goto-backend.exp
+++ b/test/rlhc.d/case/call4_go.go-Z-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call4_go.go-Z-G0--goto-backend.in b/test/rlhc.d/case/call4_go.go-Z-G0--goto-backend.in
index 148c38d5..148c38d5 100644
--- a/test/cases/rlhc.d/case/call4_go.go-Z-G0--goto-backend.in
+++ b/test/rlhc.d/case/call4_go.go-Z-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call4_go.go-Z-G1--goto-backend.exp b/test/rlhc.d/case/call4_go.go-Z-G1--goto-backend.exp
index 43c85811..43c85811 100644
--- a/test/cases/rlhc.d/case/call4_go.go-Z-G1--goto-backend.exp
+++ b/test/rlhc.d/case/call4_go.go-Z-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call4_go.go-Z-G1--goto-backend.in b/test/rlhc.d/case/call4_go.go-Z-G1--goto-backend.in
index 4d814a0f..4d814a0f 100644
--- a/test/cases/rlhc.d/case/call4_go.go-Z-G1--goto-backend.in
+++ b/test/rlhc.d/case/call4_go.go-Z-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call4_go.go-Z-G2--goto-backend.exp b/test/rlhc.d/case/call4_go.go-Z-G2--goto-backend.exp
index bef59b67..bef59b67 100644
--- a/test/cases/rlhc.d/case/call4_go.go-Z-G2--goto-backend.exp
+++ b/test/rlhc.d/case/call4_go.go-Z-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call4_go.go-Z-G2--goto-backend.in b/test/rlhc.d/case/call4_go.go-Z-G2--goto-backend.in
index 78f3099d..78f3099d 100644
--- a/test/cases/rlhc.d/case/call4_go.go-Z-G2--goto-backend.in
+++ b/test/rlhc.d/case/call4_go.go-Z-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call4_go.go-Z-T0--goto-backend.exp b/test/rlhc.d/case/call4_go.go-Z-T0--goto-backend.exp
index d4e2cca4..d4e2cca4 100644
--- a/test/cases/rlhc.d/case/call4_go.go-Z-T0--goto-backend.exp
+++ b/test/rlhc.d/case/call4_go.go-Z-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call4_go.go-Z-T0--goto-backend.in b/test/rlhc.d/case/call4_go.go-Z-T0--goto-backend.in
index 1a320f15..1a320f15 100644
--- a/test/cases/rlhc.d/case/call4_go.go-Z-T0--goto-backend.in
+++ b/test/rlhc.d/case/call4_go.go-Z-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call4_go.go-Z-T1--goto-backend.exp b/test/rlhc.d/case/call4_go.go-Z-T1--goto-backend.exp
index 6b028cbc..6b028cbc 100644
--- a/test/cases/rlhc.d/case/call4_go.go-Z-T1--goto-backend.exp
+++ b/test/rlhc.d/case/call4_go.go-Z-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call4_go.go-Z-T1--goto-backend.in b/test/rlhc.d/case/call4_go.go-Z-T1--goto-backend.in
index 8e0b199c..8e0b199c 100644
--- a/test/cases/rlhc.d/case/call4_go.go-Z-T1--goto-backend.in
+++ b/test/rlhc.d/case/call4_go.go-Z-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call4_java.java-J-F0--goto-backend.exp b/test/rlhc.d/case/call4_java.java-J-F0--goto-backend.exp
index eced5add..eced5add 100644
--- a/test/cases/rlhc.d/case/call4_java.java-J-F0--goto-backend.exp
+++ b/test/rlhc.d/case/call4_java.java-J-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call4_java.java-J-F0--goto-backend.in b/test/rlhc.d/case/call4_java.java-J-F0--goto-backend.in
index 8d330274..8d330274 100644
--- a/test/cases/rlhc.d/case/call4_java.java-J-F0--goto-backend.in
+++ b/test/rlhc.d/case/call4_java.java-J-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call4_java.java-J-F1--goto-backend.exp b/test/rlhc.d/case/call4_java.java-J-F1--goto-backend.exp
index 28f7126d..28f7126d 100644
--- a/test/cases/rlhc.d/case/call4_java.java-J-F1--goto-backend.exp
+++ b/test/rlhc.d/case/call4_java.java-J-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call4_java.java-J-F1--goto-backend.in b/test/rlhc.d/case/call4_java.java-J-F1--goto-backend.in
index ffcc5556..ffcc5556 100644
--- a/test/cases/rlhc.d/case/call4_java.java-J-F1--goto-backend.in
+++ b/test/rlhc.d/case/call4_java.java-J-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call4_java.java-J-T0--goto-backend.exp b/test/rlhc.d/case/call4_java.java-J-T0--goto-backend.exp
index 853573ef..853573ef 100644
--- a/test/cases/rlhc.d/case/call4_java.java-J-T0--goto-backend.exp
+++ b/test/rlhc.d/case/call4_java.java-J-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call4_java.java-J-T0--goto-backend.in b/test/rlhc.d/case/call4_java.java-J-T0--goto-backend.in
index 285cfac1..285cfac1 100644
--- a/test/cases/rlhc.d/case/call4_java.java-J-T0--goto-backend.in
+++ b/test/rlhc.d/case/call4_java.java-J-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/call4_java.java-J-T1--goto-backend.exp b/test/rlhc.d/case/call4_java.java-J-T1--goto-backend.exp
index 941b42c9..941b42c9 100644
--- a/test/cases/rlhc.d/case/call4_java.java-J-T1--goto-backend.exp
+++ b/test/rlhc.d/case/call4_java.java-J-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/call4_java.java-J-T1--goto-backend.in b/test/rlhc.d/case/call4_java.java-J-T1--goto-backend.in
index b13e8b5c..b13e8b5c 100644
--- a/test/cases/rlhc.d/case/call4_java.java-J-T1--goto-backend.in
+++ b/test/rlhc.d/case/call4_java.java-J-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_c.c-C-F0--goto-backend.exp b/test/rlhc.d/case/caseindep_c.c-C-F0--goto-backend.exp
index 0dc6e248..0dc6e248 100644
--- a/test/cases/rlhc.d/case/caseindep_c.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/caseindep_c.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_c.c-C-F0--goto-backend.in b/test/rlhc.d/case/caseindep_c.c-C-F0--goto-backend.in
index 6346d07f..6346d07f 100644
--- a/test/cases/rlhc.d/case/caseindep_c.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/caseindep_c.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_c.c-C-F0--var-backend.exp b/test/rlhc.d/case/caseindep_c.c-C-F0--var-backend.exp
index 34708d07..34708d07 100644
--- a/test/cases/rlhc.d/case/caseindep_c.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/caseindep_c.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_c.c-C-F0--var-backend.in b/test/rlhc.d/case/caseindep_c.c-C-F0--var-backend.in
index 6f3cebd6..6f3cebd6 100644
--- a/test/cases/rlhc.d/case/caseindep_c.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/caseindep_c.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_c.c-C-F1--goto-backend.exp b/test/rlhc.d/case/caseindep_c.c-C-F1--goto-backend.exp
index 62db28c2..62db28c2 100644
--- a/test/cases/rlhc.d/case/caseindep_c.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/caseindep_c.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_c.c-C-F1--goto-backend.in b/test/rlhc.d/case/caseindep_c.c-C-F1--goto-backend.in
index c94f44e5..c94f44e5 100644
--- a/test/cases/rlhc.d/case/caseindep_c.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/caseindep_c.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_c.c-C-F1--var-backend.exp b/test/rlhc.d/case/caseindep_c.c-C-F1--var-backend.exp
index 34708d07..34708d07 100644
--- a/test/cases/rlhc.d/case/caseindep_c.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/caseindep_c.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_c.c-C-F1--var-backend.in b/test/rlhc.d/case/caseindep_c.c-C-F1--var-backend.in
index 6f3cebd6..6f3cebd6 100644
--- a/test/cases/rlhc.d/case/caseindep_c.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/caseindep_c.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_c.c-C-G0--goto-backend.exp b/test/rlhc.d/case/caseindep_c.c-C-G0--goto-backend.exp
index 144a6cf6..144a6cf6 100644
--- a/test/cases/rlhc.d/case/caseindep_c.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/caseindep_c.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_c.c-C-G0--goto-backend.in b/test/rlhc.d/case/caseindep_c.c-C-G0--goto-backend.in
index 09c30f23..09c30f23 100644
--- a/test/cases/rlhc.d/case/caseindep_c.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/caseindep_c.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_c.c-C-G1--goto-backend.exp b/test/rlhc.d/case/caseindep_c.c-C-G1--goto-backend.exp
index d315e18d..d315e18d 100644
--- a/test/cases/rlhc.d/case/caseindep_c.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/caseindep_c.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_c.c-C-G1--goto-backend.in b/test/rlhc.d/case/caseindep_c.c-C-G1--goto-backend.in
index 0cebfe66..0cebfe66 100644
--- a/test/cases/rlhc.d/case/caseindep_c.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/caseindep_c.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_c.c-C-G2--goto-backend.exp b/test/rlhc.d/case/caseindep_c.c-C-G2--goto-backend.exp
index a1679952..a1679952 100644
--- a/test/cases/rlhc.d/case/caseindep_c.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/caseindep_c.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_c.c-C-G2--goto-backend.in b/test/rlhc.d/case/caseindep_c.c-C-G2--goto-backend.in
index c221288d..c221288d 100644
--- a/test/cases/rlhc.d/case/caseindep_c.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/caseindep_c.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_c.c-C-T0--goto-backend.exp b/test/rlhc.d/case/caseindep_c.c-C-T0--goto-backend.exp
index 2104db11..2104db11 100644
--- a/test/cases/rlhc.d/case/caseindep_c.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/caseindep_c.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_c.c-C-T0--goto-backend.in b/test/rlhc.d/case/caseindep_c.c-C-T0--goto-backend.in
index c2e4d48a..c2e4d48a 100644
--- a/test/cases/rlhc.d/case/caseindep_c.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/caseindep_c.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_c.c-C-T0--var-backend.exp b/test/rlhc.d/case/caseindep_c.c-C-T0--var-backend.exp
index ea312e7e..ea312e7e 100644
--- a/test/cases/rlhc.d/case/caseindep_c.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/caseindep_c.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_c.c-C-T0--var-backend.in b/test/rlhc.d/case/caseindep_c.c-C-T0--var-backend.in
index 7f251788..7f251788 100644
--- a/test/cases/rlhc.d/case/caseindep_c.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/caseindep_c.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_c.c-C-T1--goto-backend.exp b/test/rlhc.d/case/caseindep_c.c-C-T1--goto-backend.exp
index 2e0d6de1..2e0d6de1 100644
--- a/test/cases/rlhc.d/case/caseindep_c.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/caseindep_c.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_c.c-C-T1--goto-backend.in b/test/rlhc.d/case/caseindep_c.c-C-T1--goto-backend.in
index d395e428..d395e428 100644
--- a/test/cases/rlhc.d/case/caseindep_c.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/caseindep_c.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_c.c-C-T1--var-backend.exp b/test/rlhc.d/case/caseindep_c.c-C-T1--var-backend.exp
index 9b16f03c..9b16f03c 100644
--- a/test/cases/rlhc.d/case/caseindep_c.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/caseindep_c.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_c.c-C-T1--var-backend.in b/test/rlhc.d/case/caseindep_c.c-C-T1--var-backend.in
index 5963cb52..5963cb52 100644
--- a/test/cases/rlhc.d/case/caseindep_c.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/caseindep_c.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_crack.crk-K-F0--var-backend.exp b/test/rlhc.d/case/caseindep_crack.crk-K-F0--var-backend.exp
index 9314d20f..9314d20f 100644
--- a/test/cases/rlhc.d/case/caseindep_crack.crk-K-F0--var-backend.exp
+++ b/test/rlhc.d/case/caseindep_crack.crk-K-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_crack.crk-K-F0--var-backend.in b/test/rlhc.d/case/caseindep_crack.crk-K-F0--var-backend.in
index 53602ccd..53602ccd 100644
--- a/test/cases/rlhc.d/case/caseindep_crack.crk-K-F0--var-backend.in
+++ b/test/rlhc.d/case/caseindep_crack.crk-K-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_crack.crk-K-F1--var-backend.exp b/test/rlhc.d/case/caseindep_crack.crk-K-F1--var-backend.exp
index 9314d20f..9314d20f 100644
--- a/test/cases/rlhc.d/case/caseindep_crack.crk-K-F1--var-backend.exp
+++ b/test/rlhc.d/case/caseindep_crack.crk-K-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_crack.crk-K-F1--var-backend.in b/test/rlhc.d/case/caseindep_crack.crk-K-F1--var-backend.in
index 53602ccd..53602ccd 100644
--- a/test/cases/rlhc.d/case/caseindep_crack.crk-K-F1--var-backend.in
+++ b/test/rlhc.d/case/caseindep_crack.crk-K-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_crack.crk-K-T0--var-backend.exp b/test/rlhc.d/case/caseindep_crack.crk-K-T0--var-backend.exp
index a3606a41..a3606a41 100644
--- a/test/cases/rlhc.d/case/caseindep_crack.crk-K-T0--var-backend.exp
+++ b/test/rlhc.d/case/caseindep_crack.crk-K-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_crack.crk-K-T0--var-backend.in b/test/rlhc.d/case/caseindep_crack.crk-K-T0--var-backend.in
index 6c16ff92..6c16ff92 100644
--- a/test/cases/rlhc.d/case/caseindep_crack.crk-K-T0--var-backend.in
+++ b/test/rlhc.d/case/caseindep_crack.crk-K-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_crack.crk-K-T1--var-backend.exp b/test/rlhc.d/case/caseindep_crack.crk-K-T1--var-backend.exp
index 0f206e91..0f206e91 100644
--- a/test/cases/rlhc.d/case/caseindep_crack.crk-K-T1--var-backend.exp
+++ b/test/rlhc.d/case/caseindep_crack.crk-K-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_crack.crk-K-T1--var-backend.in b/test/rlhc.d/case/caseindep_crack.crk-K-T1--var-backend.in
index 13fe71ea..13fe71ea 100644
--- a/test/cases/rlhc.d/case/caseindep_crack.crk-K-T1--var-backend.in
+++ b/test/rlhc.d/case/caseindep_crack.crk-K-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_cs.cs-A-F0--goto-backend.exp b/test/rlhc.d/case/caseindep_cs.cs-A-F0--goto-backend.exp
index 9b3eb5db..9b3eb5db 100644
--- a/test/cases/rlhc.d/case/caseindep_cs.cs-A-F0--goto-backend.exp
+++ b/test/rlhc.d/case/caseindep_cs.cs-A-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_cs.cs-A-F0--goto-backend.in b/test/rlhc.d/case/caseindep_cs.cs-A-F0--goto-backend.in
index e6240baa..e6240baa 100644
--- a/test/cases/rlhc.d/case/caseindep_cs.cs-A-F0--goto-backend.in
+++ b/test/rlhc.d/case/caseindep_cs.cs-A-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_cs.cs-A-F0--var-backend.exp b/test/rlhc.d/case/caseindep_cs.cs-A-F0--var-backend.exp
index c6ca089e..c6ca089e 100644
--- a/test/cases/rlhc.d/case/caseindep_cs.cs-A-F0--var-backend.exp
+++ b/test/rlhc.d/case/caseindep_cs.cs-A-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_cs.cs-A-F0--var-backend.in b/test/rlhc.d/case/caseindep_cs.cs-A-F0--var-backend.in
index 5ee16095..5ee16095 100644
--- a/test/cases/rlhc.d/case/caseindep_cs.cs-A-F0--var-backend.in
+++ b/test/rlhc.d/case/caseindep_cs.cs-A-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_cs.cs-A-F1--goto-backend.exp b/test/rlhc.d/case/caseindep_cs.cs-A-F1--goto-backend.exp
index 6fe478f2..6fe478f2 100644
--- a/test/cases/rlhc.d/case/caseindep_cs.cs-A-F1--goto-backend.exp
+++ b/test/rlhc.d/case/caseindep_cs.cs-A-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_cs.cs-A-F1--goto-backend.in b/test/rlhc.d/case/caseindep_cs.cs-A-F1--goto-backend.in
index 2c10fc2e..2c10fc2e 100644
--- a/test/cases/rlhc.d/case/caseindep_cs.cs-A-F1--goto-backend.in
+++ b/test/rlhc.d/case/caseindep_cs.cs-A-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_cs.cs-A-F1--var-backend.exp b/test/rlhc.d/case/caseindep_cs.cs-A-F1--var-backend.exp
index c6ca089e..c6ca089e 100644
--- a/test/cases/rlhc.d/case/caseindep_cs.cs-A-F1--var-backend.exp
+++ b/test/rlhc.d/case/caseindep_cs.cs-A-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_cs.cs-A-F1--var-backend.in b/test/rlhc.d/case/caseindep_cs.cs-A-F1--var-backend.in
index 5ee16095..5ee16095 100644
--- a/test/cases/rlhc.d/case/caseindep_cs.cs-A-F1--var-backend.in
+++ b/test/rlhc.d/case/caseindep_cs.cs-A-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_cs.cs-A-G0--goto-backend.exp b/test/rlhc.d/case/caseindep_cs.cs-A-G0--goto-backend.exp
index 134055f8..134055f8 100644
--- a/test/cases/rlhc.d/case/caseindep_cs.cs-A-G0--goto-backend.exp
+++ b/test/rlhc.d/case/caseindep_cs.cs-A-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_cs.cs-A-G0--goto-backend.in b/test/rlhc.d/case/caseindep_cs.cs-A-G0--goto-backend.in
index 19d0fca2..19d0fca2 100644
--- a/test/cases/rlhc.d/case/caseindep_cs.cs-A-G0--goto-backend.in
+++ b/test/rlhc.d/case/caseindep_cs.cs-A-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_cs.cs-A-G1--goto-backend.exp b/test/rlhc.d/case/caseindep_cs.cs-A-G1--goto-backend.exp
index 0b264df1..0b264df1 100644
--- a/test/cases/rlhc.d/case/caseindep_cs.cs-A-G1--goto-backend.exp
+++ b/test/rlhc.d/case/caseindep_cs.cs-A-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_cs.cs-A-G1--goto-backend.in b/test/rlhc.d/case/caseindep_cs.cs-A-G1--goto-backend.in
index e8982f6e..e8982f6e 100644
--- a/test/cases/rlhc.d/case/caseindep_cs.cs-A-G1--goto-backend.in
+++ b/test/rlhc.d/case/caseindep_cs.cs-A-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_cs.cs-A-T0--goto-backend.exp b/test/rlhc.d/case/caseindep_cs.cs-A-T0--goto-backend.exp
index 3256adb7..3256adb7 100644
--- a/test/cases/rlhc.d/case/caseindep_cs.cs-A-T0--goto-backend.exp
+++ b/test/rlhc.d/case/caseindep_cs.cs-A-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_cs.cs-A-T0--goto-backend.in b/test/rlhc.d/case/caseindep_cs.cs-A-T0--goto-backend.in
index a56c40f7..a56c40f7 100644
--- a/test/cases/rlhc.d/case/caseindep_cs.cs-A-T0--goto-backend.in
+++ b/test/rlhc.d/case/caseindep_cs.cs-A-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_cs.cs-A-T0--var-backend.exp b/test/rlhc.d/case/caseindep_cs.cs-A-T0--var-backend.exp
index be94c873..be94c873 100644
--- a/test/cases/rlhc.d/case/caseindep_cs.cs-A-T0--var-backend.exp
+++ b/test/rlhc.d/case/caseindep_cs.cs-A-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_cs.cs-A-T0--var-backend.in b/test/rlhc.d/case/caseindep_cs.cs-A-T0--var-backend.in
index c89e01d7..c89e01d7 100644
--- a/test/cases/rlhc.d/case/caseindep_cs.cs-A-T0--var-backend.in
+++ b/test/rlhc.d/case/caseindep_cs.cs-A-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_cs.cs-A-T1--goto-backend.exp b/test/rlhc.d/case/caseindep_cs.cs-A-T1--goto-backend.exp
index 56a22e20..56a22e20 100644
--- a/test/cases/rlhc.d/case/caseindep_cs.cs-A-T1--goto-backend.exp
+++ b/test/rlhc.d/case/caseindep_cs.cs-A-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_cs.cs-A-T1--goto-backend.in b/test/rlhc.d/case/caseindep_cs.cs-A-T1--goto-backend.in
index f90af900..f90af900 100644
--- a/test/cases/rlhc.d/case/caseindep_cs.cs-A-T1--goto-backend.in
+++ b/test/rlhc.d/case/caseindep_cs.cs-A-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_cs.cs-A-T1--var-backend.exp b/test/rlhc.d/case/caseindep_cs.cs-A-T1--var-backend.exp
index 62f42137..62f42137 100644
--- a/test/cases/rlhc.d/case/caseindep_cs.cs-A-T1--var-backend.exp
+++ b/test/rlhc.d/case/caseindep_cs.cs-A-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_cs.cs-A-T1--var-backend.in b/test/rlhc.d/case/caseindep_cs.cs-A-T1--var-backend.in
index a74b110f..a74b110f 100644
--- a/test/cases/rlhc.d/case/caseindep_cs.cs-A-T1--var-backend.in
+++ b/test/rlhc.d/case/caseindep_cs.cs-A-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_go.go-Z-F0--goto-backend.exp b/test/rlhc.d/case/caseindep_go.go-Z-F0--goto-backend.exp
index cfdaa58f..cfdaa58f 100644
--- a/test/cases/rlhc.d/case/caseindep_go.go-Z-F0--goto-backend.exp
+++ b/test/rlhc.d/case/caseindep_go.go-Z-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_go.go-Z-F0--goto-backend.in b/test/rlhc.d/case/caseindep_go.go-Z-F0--goto-backend.in
index 73189fa4..73189fa4 100644
--- a/test/cases/rlhc.d/case/caseindep_go.go-Z-F0--goto-backend.in
+++ b/test/rlhc.d/case/caseindep_go.go-Z-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_go.go-Z-F0--var-backend.exp b/test/rlhc.d/case/caseindep_go.go-Z-F0--var-backend.exp
index e09a4ff0..e09a4ff0 100644
--- a/test/cases/rlhc.d/case/caseindep_go.go-Z-F0--var-backend.exp
+++ b/test/rlhc.d/case/caseindep_go.go-Z-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_go.go-Z-F0--var-backend.in b/test/rlhc.d/case/caseindep_go.go-Z-F0--var-backend.in
index 9f4ee74c..9f4ee74c 100644
--- a/test/cases/rlhc.d/case/caseindep_go.go-Z-F0--var-backend.in
+++ b/test/rlhc.d/case/caseindep_go.go-Z-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_go.go-Z-F1--goto-backend.exp b/test/rlhc.d/case/caseindep_go.go-Z-F1--goto-backend.exp
index 3bd687c5..3bd687c5 100644
--- a/test/cases/rlhc.d/case/caseindep_go.go-Z-F1--goto-backend.exp
+++ b/test/rlhc.d/case/caseindep_go.go-Z-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_go.go-Z-F1--goto-backend.in b/test/rlhc.d/case/caseindep_go.go-Z-F1--goto-backend.in
index 62e2bf53..62e2bf53 100644
--- a/test/cases/rlhc.d/case/caseindep_go.go-Z-F1--goto-backend.in
+++ b/test/rlhc.d/case/caseindep_go.go-Z-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_go.go-Z-F1--var-backend.exp b/test/rlhc.d/case/caseindep_go.go-Z-F1--var-backend.exp
index e09a4ff0..e09a4ff0 100644
--- a/test/cases/rlhc.d/case/caseindep_go.go-Z-F1--var-backend.exp
+++ b/test/rlhc.d/case/caseindep_go.go-Z-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_go.go-Z-F1--var-backend.in b/test/rlhc.d/case/caseindep_go.go-Z-F1--var-backend.in
index 9f4ee74c..9f4ee74c 100644
--- a/test/cases/rlhc.d/case/caseindep_go.go-Z-F1--var-backend.in
+++ b/test/rlhc.d/case/caseindep_go.go-Z-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_go.go-Z-G0--goto-backend.exp b/test/rlhc.d/case/caseindep_go.go-Z-G0--goto-backend.exp
index ee1f4211..ee1f4211 100644
--- a/test/cases/rlhc.d/case/caseindep_go.go-Z-G0--goto-backend.exp
+++ b/test/rlhc.d/case/caseindep_go.go-Z-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_go.go-Z-G0--goto-backend.in b/test/rlhc.d/case/caseindep_go.go-Z-G0--goto-backend.in
index 124b3be6..124b3be6 100644
--- a/test/cases/rlhc.d/case/caseindep_go.go-Z-G0--goto-backend.in
+++ b/test/rlhc.d/case/caseindep_go.go-Z-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_go.go-Z-G1--goto-backend.exp b/test/rlhc.d/case/caseindep_go.go-Z-G1--goto-backend.exp
index 65c6bd19..65c6bd19 100644
--- a/test/cases/rlhc.d/case/caseindep_go.go-Z-G1--goto-backend.exp
+++ b/test/rlhc.d/case/caseindep_go.go-Z-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_go.go-Z-G1--goto-backend.in b/test/rlhc.d/case/caseindep_go.go-Z-G1--goto-backend.in
index 3790b7cc..3790b7cc 100644
--- a/test/cases/rlhc.d/case/caseindep_go.go-Z-G1--goto-backend.in
+++ b/test/rlhc.d/case/caseindep_go.go-Z-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_go.go-Z-G2--goto-backend.exp b/test/rlhc.d/case/caseindep_go.go-Z-G2--goto-backend.exp
index 6b2a1c5f..6b2a1c5f 100644
--- a/test/cases/rlhc.d/case/caseindep_go.go-Z-G2--goto-backend.exp
+++ b/test/rlhc.d/case/caseindep_go.go-Z-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_go.go-Z-G2--goto-backend.in b/test/rlhc.d/case/caseindep_go.go-Z-G2--goto-backend.in
index 2b4573cb..2b4573cb 100644
--- a/test/cases/rlhc.d/case/caseindep_go.go-Z-G2--goto-backend.in
+++ b/test/rlhc.d/case/caseindep_go.go-Z-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_go.go-Z-T0--goto-backend.exp b/test/rlhc.d/case/caseindep_go.go-Z-T0--goto-backend.exp
index 9ec7d11d..9ec7d11d 100644
--- a/test/cases/rlhc.d/case/caseindep_go.go-Z-T0--goto-backend.exp
+++ b/test/rlhc.d/case/caseindep_go.go-Z-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_go.go-Z-T0--goto-backend.in b/test/rlhc.d/case/caseindep_go.go-Z-T0--goto-backend.in
index bf9f7807..bf9f7807 100644
--- a/test/cases/rlhc.d/case/caseindep_go.go-Z-T0--goto-backend.in
+++ b/test/rlhc.d/case/caseindep_go.go-Z-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_go.go-Z-T0--var-backend.exp b/test/rlhc.d/case/caseindep_go.go-Z-T0--var-backend.exp
index fd17e6f2..fd17e6f2 100644
--- a/test/cases/rlhc.d/case/caseindep_go.go-Z-T0--var-backend.exp
+++ b/test/rlhc.d/case/caseindep_go.go-Z-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_go.go-Z-T0--var-backend.in b/test/rlhc.d/case/caseindep_go.go-Z-T0--var-backend.in
index 99906036..99906036 100644
--- a/test/cases/rlhc.d/case/caseindep_go.go-Z-T0--var-backend.in
+++ b/test/rlhc.d/case/caseindep_go.go-Z-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_go.go-Z-T1--goto-backend.exp b/test/rlhc.d/case/caseindep_go.go-Z-T1--goto-backend.exp
index 8d798c41..8d798c41 100644
--- a/test/cases/rlhc.d/case/caseindep_go.go-Z-T1--goto-backend.exp
+++ b/test/rlhc.d/case/caseindep_go.go-Z-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_go.go-Z-T1--goto-backend.in b/test/rlhc.d/case/caseindep_go.go-Z-T1--goto-backend.in
index 2055319a..2055319a 100644
--- a/test/cases/rlhc.d/case/caseindep_go.go-Z-T1--goto-backend.in
+++ b/test/rlhc.d/case/caseindep_go.go-Z-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_go.go-Z-T1--var-backend.exp b/test/rlhc.d/case/caseindep_go.go-Z-T1--var-backend.exp
index f6524cb3..f6524cb3 100644
--- a/test/cases/rlhc.d/case/caseindep_go.go-Z-T1--var-backend.exp
+++ b/test/rlhc.d/case/caseindep_go.go-Z-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_go.go-Z-T1--var-backend.in b/test/rlhc.d/case/caseindep_go.go-Z-T1--var-backend.in
index 75b7f695..75b7f695 100644
--- a/test/cases/rlhc.d/case/caseindep_go.go-Z-T1--var-backend.in
+++ b/test/rlhc.d/case/caseindep_go.go-Z-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_java.java-J-F0--goto-backend.exp b/test/rlhc.d/case/caseindep_java.java-J-F0--goto-backend.exp
index 47ec314e..47ec314e 100644
--- a/test/cases/rlhc.d/case/caseindep_java.java-J-F0--goto-backend.exp
+++ b/test/rlhc.d/case/caseindep_java.java-J-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_java.java-J-F0--goto-backend.in b/test/rlhc.d/case/caseindep_java.java-J-F0--goto-backend.in
index 9b21e662..9b21e662 100644
--- a/test/cases/rlhc.d/case/caseindep_java.java-J-F0--goto-backend.in
+++ b/test/rlhc.d/case/caseindep_java.java-J-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_java.java-J-F0--var-backend.exp b/test/rlhc.d/case/caseindep_java.java-J-F0--var-backend.exp
index 417f12a4..417f12a4 100644
--- a/test/cases/rlhc.d/case/caseindep_java.java-J-F0--var-backend.exp
+++ b/test/rlhc.d/case/caseindep_java.java-J-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_java.java-J-F0--var-backend.in b/test/rlhc.d/case/caseindep_java.java-J-F0--var-backend.in
index 03fd3697..03fd3697 100644
--- a/test/cases/rlhc.d/case/caseindep_java.java-J-F0--var-backend.in
+++ b/test/rlhc.d/case/caseindep_java.java-J-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_java.java-J-F1--goto-backend.exp b/test/rlhc.d/case/caseindep_java.java-J-F1--goto-backend.exp
index ec7bd1d6..ec7bd1d6 100644
--- a/test/cases/rlhc.d/case/caseindep_java.java-J-F1--goto-backend.exp
+++ b/test/rlhc.d/case/caseindep_java.java-J-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_java.java-J-F1--goto-backend.in b/test/rlhc.d/case/caseindep_java.java-J-F1--goto-backend.in
index 750987c4..750987c4 100644
--- a/test/cases/rlhc.d/case/caseindep_java.java-J-F1--goto-backend.in
+++ b/test/rlhc.d/case/caseindep_java.java-J-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_java.java-J-F1--var-backend.exp b/test/rlhc.d/case/caseindep_java.java-J-F1--var-backend.exp
index 417f12a4..417f12a4 100644
--- a/test/cases/rlhc.d/case/caseindep_java.java-J-F1--var-backend.exp
+++ b/test/rlhc.d/case/caseindep_java.java-J-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_java.java-J-F1--var-backend.in b/test/rlhc.d/case/caseindep_java.java-J-F1--var-backend.in
index 03fd3697..03fd3697 100644
--- a/test/cases/rlhc.d/case/caseindep_java.java-J-F1--var-backend.in
+++ b/test/rlhc.d/case/caseindep_java.java-J-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_java.java-J-T0--goto-backend.exp b/test/rlhc.d/case/caseindep_java.java-J-T0--goto-backend.exp
index aa7f6e80..aa7f6e80 100644
--- a/test/cases/rlhc.d/case/caseindep_java.java-J-T0--goto-backend.exp
+++ b/test/rlhc.d/case/caseindep_java.java-J-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_java.java-J-T0--goto-backend.in b/test/rlhc.d/case/caseindep_java.java-J-T0--goto-backend.in
index 03b4f4d4..03b4f4d4 100644
--- a/test/cases/rlhc.d/case/caseindep_java.java-J-T0--goto-backend.in
+++ b/test/rlhc.d/case/caseindep_java.java-J-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_java.java-J-T0--var-backend.exp b/test/rlhc.d/case/caseindep_java.java-J-T0--var-backend.exp
index af887a97..af887a97 100644
--- a/test/cases/rlhc.d/case/caseindep_java.java-J-T0--var-backend.exp
+++ b/test/rlhc.d/case/caseindep_java.java-J-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_java.java-J-T0--var-backend.in b/test/rlhc.d/case/caseindep_java.java-J-T0--var-backend.in
index 21aa629f..21aa629f 100644
--- a/test/cases/rlhc.d/case/caseindep_java.java-J-T0--var-backend.in
+++ b/test/rlhc.d/case/caseindep_java.java-J-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_java.java-J-T1--goto-backend.exp b/test/rlhc.d/case/caseindep_java.java-J-T1--goto-backend.exp
index d2fa5cda..d2fa5cda 100644
--- a/test/cases/rlhc.d/case/caseindep_java.java-J-T1--goto-backend.exp
+++ b/test/rlhc.d/case/caseindep_java.java-J-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_java.java-J-T1--goto-backend.in b/test/rlhc.d/case/caseindep_java.java-J-T1--goto-backend.in
index 0264ce32..0264ce32 100644
--- a/test/cases/rlhc.d/case/caseindep_java.java-J-T1--goto-backend.in
+++ b/test/rlhc.d/case/caseindep_java.java-J-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_java.java-J-T1--var-backend.exp b/test/rlhc.d/case/caseindep_java.java-J-T1--var-backend.exp
index 1641990b..1641990b 100644
--- a/test/cases/rlhc.d/case/caseindep_java.java-J-T1--var-backend.exp
+++ b/test/rlhc.d/case/caseindep_java.java-J-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_java.java-J-T1--var-backend.in b/test/rlhc.d/case/caseindep_java.java-J-T1--var-backend.in
index 1f5da2a8..1f5da2a8 100644
--- a/test/cases/rlhc.d/case/caseindep_java.java-J-T1--var-backend.in
+++ b/test/rlhc.d/case/caseindep_java.java-J-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_julia.jl-Y-F0--var-backend.exp b/test/rlhc.d/case/caseindep_julia.jl-Y-F0--var-backend.exp
index f439f446..f439f446 100644
--- a/test/cases/rlhc.d/case/caseindep_julia.jl-Y-F0--var-backend.exp
+++ b/test/rlhc.d/case/caseindep_julia.jl-Y-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_julia.jl-Y-F0--var-backend.in b/test/rlhc.d/case/caseindep_julia.jl-Y-F0--var-backend.in
index 5601b8f2..5601b8f2 100644
--- a/test/cases/rlhc.d/case/caseindep_julia.jl-Y-F0--var-backend.in
+++ b/test/rlhc.d/case/caseindep_julia.jl-Y-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_julia.jl-Y-F1--var-backend.exp b/test/rlhc.d/case/caseindep_julia.jl-Y-F1--var-backend.exp
index f439f446..f439f446 100644
--- a/test/cases/rlhc.d/case/caseindep_julia.jl-Y-F1--var-backend.exp
+++ b/test/rlhc.d/case/caseindep_julia.jl-Y-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_julia.jl-Y-F1--var-backend.in b/test/rlhc.d/case/caseindep_julia.jl-Y-F1--var-backend.in
index 5601b8f2..5601b8f2 100644
--- a/test/cases/rlhc.d/case/caseindep_julia.jl-Y-F1--var-backend.in
+++ b/test/rlhc.d/case/caseindep_julia.jl-Y-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_julia.jl-Y-T0--var-backend.exp b/test/rlhc.d/case/caseindep_julia.jl-Y-T0--var-backend.exp
index 87036c82..87036c82 100644
--- a/test/cases/rlhc.d/case/caseindep_julia.jl-Y-T0--var-backend.exp
+++ b/test/rlhc.d/case/caseindep_julia.jl-Y-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_julia.jl-Y-T0--var-backend.in b/test/rlhc.d/case/caseindep_julia.jl-Y-T0--var-backend.in
index c4d5581f..c4d5581f 100644
--- a/test/cases/rlhc.d/case/caseindep_julia.jl-Y-T0--var-backend.in
+++ b/test/rlhc.d/case/caseindep_julia.jl-Y-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_julia.jl-Y-T1--var-backend.exp b/test/rlhc.d/case/caseindep_julia.jl-Y-T1--var-backend.exp
index bd65746f..bd65746f 100644
--- a/test/cases/rlhc.d/case/caseindep_julia.jl-Y-T1--var-backend.exp
+++ b/test/rlhc.d/case/caseindep_julia.jl-Y-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_julia.jl-Y-T1--var-backend.in b/test/rlhc.d/case/caseindep_julia.jl-Y-T1--var-backend.in
index 414e1391..414e1391 100644
--- a/test/cases/rlhc.d/case/caseindep_julia.jl-Y-T1--var-backend.in
+++ b/test/rlhc.d/case/caseindep_julia.jl-Y-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_ocaml.ml-O-F0--var-backend.exp b/test/rlhc.d/case/caseindep_ocaml.ml-O-F0--var-backend.exp
index 67ca8658..67ca8658 100644
--- a/test/cases/rlhc.d/case/caseindep_ocaml.ml-O-F0--var-backend.exp
+++ b/test/rlhc.d/case/caseindep_ocaml.ml-O-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_ocaml.ml-O-F0--var-backend.in b/test/rlhc.d/case/caseindep_ocaml.ml-O-F0--var-backend.in
index b6d4474f..b6d4474f 100644
--- a/test/cases/rlhc.d/case/caseindep_ocaml.ml-O-F0--var-backend.in
+++ b/test/rlhc.d/case/caseindep_ocaml.ml-O-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_ocaml.ml-O-F1--var-backend.exp b/test/rlhc.d/case/caseindep_ocaml.ml-O-F1--var-backend.exp
index 67ca8658..67ca8658 100644
--- a/test/cases/rlhc.d/case/caseindep_ocaml.ml-O-F1--var-backend.exp
+++ b/test/rlhc.d/case/caseindep_ocaml.ml-O-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_ocaml.ml-O-F1--var-backend.in b/test/rlhc.d/case/caseindep_ocaml.ml-O-F1--var-backend.in
index b6d4474f..b6d4474f 100644
--- a/test/cases/rlhc.d/case/caseindep_ocaml.ml-O-F1--var-backend.in
+++ b/test/rlhc.d/case/caseindep_ocaml.ml-O-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_ocaml.ml-O-T0--var-backend.exp b/test/rlhc.d/case/caseindep_ocaml.ml-O-T0--var-backend.exp
index 2feecb9c..2feecb9c 100644
--- a/test/cases/rlhc.d/case/caseindep_ocaml.ml-O-T0--var-backend.exp
+++ b/test/rlhc.d/case/caseindep_ocaml.ml-O-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_ocaml.ml-O-T0--var-backend.in b/test/rlhc.d/case/caseindep_ocaml.ml-O-T0--var-backend.in
index 820e089e..820e089e 100644
--- a/test/cases/rlhc.d/case/caseindep_ocaml.ml-O-T0--var-backend.in
+++ b/test/rlhc.d/case/caseindep_ocaml.ml-O-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_ocaml.ml-O-T1--var-backend.exp b/test/rlhc.d/case/caseindep_ocaml.ml-O-T1--var-backend.exp
index f3633962..f3633962 100644
--- a/test/cases/rlhc.d/case/caseindep_ocaml.ml-O-T1--var-backend.exp
+++ b/test/rlhc.d/case/caseindep_ocaml.ml-O-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_ocaml.ml-O-T1--var-backend.in b/test/rlhc.d/case/caseindep_ocaml.ml-O-T1--var-backend.in
index 3ed6988d..3ed6988d 100644
--- a/test/cases/rlhc.d/case/caseindep_ocaml.ml-O-T1--var-backend.in
+++ b/test/rlhc.d/case/caseindep_ocaml.ml-O-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_ruby.rb-R-F0--var-backend.exp b/test/rlhc.d/case/caseindep_ruby.rb-R-F0--var-backend.exp
index 64a9f2cb..64a9f2cb 100644
--- a/test/cases/rlhc.d/case/caseindep_ruby.rb-R-F0--var-backend.exp
+++ b/test/rlhc.d/case/caseindep_ruby.rb-R-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_ruby.rb-R-F0--var-backend.in b/test/rlhc.d/case/caseindep_ruby.rb-R-F0--var-backend.in
index 1d6fdade..1d6fdade 100644
--- a/test/cases/rlhc.d/case/caseindep_ruby.rb-R-F0--var-backend.in
+++ b/test/rlhc.d/case/caseindep_ruby.rb-R-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_ruby.rb-R-F1--var-backend.exp b/test/rlhc.d/case/caseindep_ruby.rb-R-F1--var-backend.exp
index 64a9f2cb..64a9f2cb 100644
--- a/test/cases/rlhc.d/case/caseindep_ruby.rb-R-F1--var-backend.exp
+++ b/test/rlhc.d/case/caseindep_ruby.rb-R-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_ruby.rb-R-F1--var-backend.in b/test/rlhc.d/case/caseindep_ruby.rb-R-F1--var-backend.in
index 1d6fdade..1d6fdade 100644
--- a/test/cases/rlhc.d/case/caseindep_ruby.rb-R-F1--var-backend.in
+++ b/test/rlhc.d/case/caseindep_ruby.rb-R-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_ruby.rb-R-T0--var-backend.exp b/test/rlhc.d/case/caseindep_ruby.rb-R-T0--var-backend.exp
index 38bf95e1..38bf95e1 100644
--- a/test/cases/rlhc.d/case/caseindep_ruby.rb-R-T0--var-backend.exp
+++ b/test/rlhc.d/case/caseindep_ruby.rb-R-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_ruby.rb-R-T0--var-backend.in b/test/rlhc.d/case/caseindep_ruby.rb-R-T0--var-backend.in
index 81d27a63..81d27a63 100644
--- a/test/cases/rlhc.d/case/caseindep_ruby.rb-R-T0--var-backend.in
+++ b/test/rlhc.d/case/caseindep_ruby.rb-R-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_ruby.rb-R-T1--var-backend.exp b/test/rlhc.d/case/caseindep_ruby.rb-R-T1--var-backend.exp
index df630e60..df630e60 100644
--- a/test/cases/rlhc.d/case/caseindep_ruby.rb-R-T1--var-backend.exp
+++ b/test/rlhc.d/case/caseindep_ruby.rb-R-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_ruby.rb-R-T1--var-backend.in b/test/rlhc.d/case/caseindep_ruby.rb-R-T1--var-backend.in
index 8a02ef8c..8a02ef8c 100644
--- a/test/cases/rlhc.d/case/caseindep_ruby.rb-R-T1--var-backend.in
+++ b/test/rlhc.d/case/caseindep_ruby.rb-R-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_rust.rs-U-F0--var-backend.exp b/test/rlhc.d/case/caseindep_rust.rs-U-F0--var-backend.exp
index fa50c006..fa50c006 100644
--- a/test/cases/rlhc.d/case/caseindep_rust.rs-U-F0--var-backend.exp
+++ b/test/rlhc.d/case/caseindep_rust.rs-U-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_rust.rs-U-F0--var-backend.in b/test/rlhc.d/case/caseindep_rust.rs-U-F0--var-backend.in
index 88ac55c1..88ac55c1 100644
--- a/test/cases/rlhc.d/case/caseindep_rust.rs-U-F0--var-backend.in
+++ b/test/rlhc.d/case/caseindep_rust.rs-U-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_rust.rs-U-F1--var-backend.exp b/test/rlhc.d/case/caseindep_rust.rs-U-F1--var-backend.exp
index fa50c006..fa50c006 100644
--- a/test/cases/rlhc.d/case/caseindep_rust.rs-U-F1--var-backend.exp
+++ b/test/rlhc.d/case/caseindep_rust.rs-U-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_rust.rs-U-F1--var-backend.in b/test/rlhc.d/case/caseindep_rust.rs-U-F1--var-backend.in
index 88ac55c1..88ac55c1 100644
--- a/test/cases/rlhc.d/case/caseindep_rust.rs-U-F1--var-backend.in
+++ b/test/rlhc.d/case/caseindep_rust.rs-U-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_rust.rs-U-T0--var-backend.exp b/test/rlhc.d/case/caseindep_rust.rs-U-T0--var-backend.exp
index 4172c048..4172c048 100644
--- a/test/cases/rlhc.d/case/caseindep_rust.rs-U-T0--var-backend.exp
+++ b/test/rlhc.d/case/caseindep_rust.rs-U-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_rust.rs-U-T0--var-backend.in b/test/rlhc.d/case/caseindep_rust.rs-U-T0--var-backend.in
index 2fe92e82..2fe92e82 100644
--- a/test/cases/rlhc.d/case/caseindep_rust.rs-U-T0--var-backend.in
+++ b/test/rlhc.d/case/caseindep_rust.rs-U-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/caseindep_rust.rs-U-T1--var-backend.exp b/test/rlhc.d/case/caseindep_rust.rs-U-T1--var-backend.exp
index 9995a640..9995a640 100644
--- a/test/cases/rlhc.d/case/caseindep_rust.rs-U-T1--var-backend.exp
+++ b/test/rlhc.d/case/caseindep_rust.rs-U-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/caseindep_rust.rs-U-T1--var-backend.in b/test/rlhc.d/case/caseindep_rust.rs-U-T1--var-backend.in
index fa3dfb8e..fa3dfb8e 100644
--- a/test/cases/rlhc.d/case/caseindep_rust.rs-U-T1--var-backend.in
+++ b/test/rlhc.d/case/caseindep_rust.rs-U-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang1.c-C-F0--goto-backend.exp b/test/rlhc.d/case/clang1.c-C-F0--goto-backend.exp
index e89bbbae..e89bbbae 100644
--- a/test/cases/rlhc.d/case/clang1.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/clang1.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/clang1.c-C-F0--goto-backend.in b/test/rlhc.d/case/clang1.c-C-F0--goto-backend.in
index 1911e454..1911e454 100644
--- a/test/cases/rlhc.d/case/clang1.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/clang1.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/clang1.c-C-F0--var-backend.exp b/test/rlhc.d/case/clang1.c-C-F0--var-backend.exp
index 96fabfe7..96fabfe7 100644
--- a/test/cases/rlhc.d/case/clang1.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/clang1.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang1.c-C-F0--var-backend.in b/test/rlhc.d/case/clang1.c-C-F0--var-backend.in
index 49f8df37..49f8df37 100644
--- a/test/cases/rlhc.d/case/clang1.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/clang1.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang1.c-C-F1--goto-backend.exp b/test/rlhc.d/case/clang1.c-C-F1--goto-backend.exp
index 03a177bb..03a177bb 100644
--- a/test/cases/rlhc.d/case/clang1.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/clang1.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/clang1.c-C-F1--goto-backend.in b/test/rlhc.d/case/clang1.c-C-F1--goto-backend.in
index 440ffc73..440ffc73 100644
--- a/test/cases/rlhc.d/case/clang1.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/clang1.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/clang1.c-C-F1--var-backend.exp b/test/rlhc.d/case/clang1.c-C-F1--var-backend.exp
index 8dd21cf1..8dd21cf1 100644
--- a/test/cases/rlhc.d/case/clang1.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/clang1.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang1.c-C-F1--var-backend.in b/test/rlhc.d/case/clang1.c-C-F1--var-backend.in
index 3e4efd9b..3e4efd9b 100644
--- a/test/cases/rlhc.d/case/clang1.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/clang1.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang1.c-C-G0--goto-backend.exp b/test/rlhc.d/case/clang1.c-C-G0--goto-backend.exp
index 8895a632..8895a632 100644
--- a/test/cases/rlhc.d/case/clang1.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/clang1.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/clang1.c-C-G0--goto-backend.in b/test/rlhc.d/case/clang1.c-C-G0--goto-backend.in
index 8f9db26c..8f9db26c 100644
--- a/test/cases/rlhc.d/case/clang1.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/clang1.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/clang1.c-C-G1--goto-backend.exp b/test/rlhc.d/case/clang1.c-C-G1--goto-backend.exp
index d7f657ef..d7f657ef 100644
--- a/test/cases/rlhc.d/case/clang1.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/clang1.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/clang1.c-C-G1--goto-backend.in b/test/rlhc.d/case/clang1.c-C-G1--goto-backend.in
index e070536b..e070536b 100644
--- a/test/cases/rlhc.d/case/clang1.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/clang1.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/clang1.c-C-G2--goto-backend.exp b/test/rlhc.d/case/clang1.c-C-G2--goto-backend.exp
index 78585c3f..78585c3f 100644
--- a/test/cases/rlhc.d/case/clang1.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/clang1.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/clang1.c-C-G2--goto-backend.in b/test/rlhc.d/case/clang1.c-C-G2--goto-backend.in
index 7fca8dd9..7fca8dd9 100644
--- a/test/cases/rlhc.d/case/clang1.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/clang1.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/clang1.c-C-T0--goto-backend.exp b/test/rlhc.d/case/clang1.c-C-T0--goto-backend.exp
index d3c81ad0..d3c81ad0 100644
--- a/test/cases/rlhc.d/case/clang1.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/clang1.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/clang1.c-C-T0--goto-backend.in b/test/rlhc.d/case/clang1.c-C-T0--goto-backend.in
index 5c45ea1c..5c45ea1c 100644
--- a/test/cases/rlhc.d/case/clang1.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/clang1.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/clang1.c-C-T0--var-backend.exp b/test/rlhc.d/case/clang1.c-C-T0--var-backend.exp
index 1096d942..1096d942 100644
--- a/test/cases/rlhc.d/case/clang1.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/clang1.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang1.c-C-T0--var-backend.in b/test/rlhc.d/case/clang1.c-C-T0--var-backend.in
index f2df5234..f2df5234 100644
--- a/test/cases/rlhc.d/case/clang1.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/clang1.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang1.c-C-T1--goto-backend.exp b/test/rlhc.d/case/clang1.c-C-T1--goto-backend.exp
index 8ada87bf..8ada87bf 100644
--- a/test/cases/rlhc.d/case/clang1.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/clang1.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/clang1.c-C-T1--goto-backend.in b/test/rlhc.d/case/clang1.c-C-T1--goto-backend.in
index f4d8b250..f4d8b250 100644
--- a/test/cases/rlhc.d/case/clang1.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/clang1.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/clang1.c-C-T1--var-backend.exp b/test/rlhc.d/case/clang1.c-C-T1--var-backend.exp
index 5242d94e..5242d94e 100644
--- a/test/cases/rlhc.d/case/clang1.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/clang1.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang1.c-C-T1--var-backend.in b/test/rlhc.d/case/clang1.c-C-T1--var-backend.in
index 46e91068..46e91068 100644
--- a/test/cases/rlhc.d/case/clang1.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/clang1.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang2.m-C-F0--goto-backend.exp b/test/rlhc.d/case/clang2.m-C-F0--goto-backend.exp
index a5f53d49..a5f53d49 100644
--- a/test/cases/rlhc.d/case/clang2.m-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/clang2.m-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/clang2.m-C-F0--goto-backend.in b/test/rlhc.d/case/clang2.m-C-F0--goto-backend.in
index 92b478c4..92b478c4 100644
--- a/test/cases/rlhc.d/case/clang2.m-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/clang2.m-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/clang2.m-C-F0--var-backend.exp b/test/rlhc.d/case/clang2.m-C-F0--var-backend.exp
index 590541d9..590541d9 100644
--- a/test/cases/rlhc.d/case/clang2.m-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/clang2.m-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang2.m-C-F0--var-backend.in b/test/rlhc.d/case/clang2.m-C-F0--var-backend.in
index a27f6822..a27f6822 100644
--- a/test/cases/rlhc.d/case/clang2.m-C-F0--var-backend.in
+++ b/test/rlhc.d/case/clang2.m-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang2.m-C-F1--goto-backend.exp b/test/rlhc.d/case/clang2.m-C-F1--goto-backend.exp
index b2153547..b2153547 100644
--- a/test/cases/rlhc.d/case/clang2.m-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/clang2.m-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/clang2.m-C-F1--goto-backend.in b/test/rlhc.d/case/clang2.m-C-F1--goto-backend.in
index f966c7f1..f966c7f1 100644
--- a/test/cases/rlhc.d/case/clang2.m-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/clang2.m-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/clang2.m-C-F1--var-backend.exp b/test/rlhc.d/case/clang2.m-C-F1--var-backend.exp
index cdb900f8..cdb900f8 100644
--- a/test/cases/rlhc.d/case/clang2.m-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/clang2.m-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang2.m-C-F1--var-backend.in b/test/rlhc.d/case/clang2.m-C-F1--var-backend.in
index 68ed0c0d..68ed0c0d 100644
--- a/test/cases/rlhc.d/case/clang2.m-C-F1--var-backend.in
+++ b/test/rlhc.d/case/clang2.m-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang2.m-C-G0--goto-backend.exp b/test/rlhc.d/case/clang2.m-C-G0--goto-backend.exp
index fe87ca20..fe87ca20 100644
--- a/test/cases/rlhc.d/case/clang2.m-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/clang2.m-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/clang2.m-C-G0--goto-backend.in b/test/rlhc.d/case/clang2.m-C-G0--goto-backend.in
index cfbe101d..cfbe101d 100644
--- a/test/cases/rlhc.d/case/clang2.m-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/clang2.m-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/clang2.m-C-G1--goto-backend.exp b/test/rlhc.d/case/clang2.m-C-G1--goto-backend.exp
index ff214120..ff214120 100644
--- a/test/cases/rlhc.d/case/clang2.m-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/clang2.m-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/clang2.m-C-G1--goto-backend.in b/test/rlhc.d/case/clang2.m-C-G1--goto-backend.in
index 78800c5e..78800c5e 100644
--- a/test/cases/rlhc.d/case/clang2.m-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/clang2.m-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/clang2.m-C-G2--goto-backend.exp b/test/rlhc.d/case/clang2.m-C-G2--goto-backend.exp
index 2623dc93..2623dc93 100644
--- a/test/cases/rlhc.d/case/clang2.m-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/clang2.m-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/clang2.m-C-G2--goto-backend.in b/test/rlhc.d/case/clang2.m-C-G2--goto-backend.in
index 59d22b2a..59d22b2a 100644
--- a/test/cases/rlhc.d/case/clang2.m-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/clang2.m-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/clang2.m-C-T0--goto-backend.exp b/test/rlhc.d/case/clang2.m-C-T0--goto-backend.exp
index e99b3b12..e99b3b12 100644
--- a/test/cases/rlhc.d/case/clang2.m-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/clang2.m-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/clang2.m-C-T0--goto-backend.in b/test/rlhc.d/case/clang2.m-C-T0--goto-backend.in
index 492a327b..492a327b 100644
--- a/test/cases/rlhc.d/case/clang2.m-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/clang2.m-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/clang2.m-C-T0--var-backend.exp b/test/rlhc.d/case/clang2.m-C-T0--var-backend.exp
index 7b334171..7b334171 100644
--- a/test/cases/rlhc.d/case/clang2.m-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/clang2.m-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang2.m-C-T0--var-backend.in b/test/rlhc.d/case/clang2.m-C-T0--var-backend.in
index 6d564313..6d564313 100644
--- a/test/cases/rlhc.d/case/clang2.m-C-T0--var-backend.in
+++ b/test/rlhc.d/case/clang2.m-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang2.m-C-T1--goto-backend.exp b/test/rlhc.d/case/clang2.m-C-T1--goto-backend.exp
index 46fa05a5..46fa05a5 100644
--- a/test/cases/rlhc.d/case/clang2.m-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/clang2.m-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/clang2.m-C-T1--goto-backend.in b/test/rlhc.d/case/clang2.m-C-T1--goto-backend.in
index 36f758ee..36f758ee 100644
--- a/test/cases/rlhc.d/case/clang2.m-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/clang2.m-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/clang2.m-C-T1--var-backend.exp b/test/rlhc.d/case/clang2.m-C-T1--var-backend.exp
index 83b49a11..83b49a11 100644
--- a/test/cases/rlhc.d/case/clang2.m-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/clang2.m-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang2.m-C-T1--var-backend.in b/test/rlhc.d/case/clang2.m-C-T1--var-backend.in
index 1cbc70ee..1cbc70ee 100644
--- a/test/cases/rlhc.d/case/clang2.m-C-T1--var-backend.in
+++ b/test/rlhc.d/case/clang2.m-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_c.c-C-F0--goto-backend.exp b/test/rlhc.d/case/clang4_c.c-C-F0--goto-backend.exp
index f52f9684..f52f9684 100644
--- a/test/cases/rlhc.d/case/clang4_c.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/clang4_c.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_c.c-C-F0--goto-backend.in b/test/rlhc.d/case/clang4_c.c-C-F0--goto-backend.in
index ad220226..ad220226 100644
--- a/test/cases/rlhc.d/case/clang4_c.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/clang4_c.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_c.c-C-F0--var-backend.exp b/test/rlhc.d/case/clang4_c.c-C-F0--var-backend.exp
index edb8d973..edb8d973 100644
--- a/test/cases/rlhc.d/case/clang4_c.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/clang4_c.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_c.c-C-F0--var-backend.in b/test/rlhc.d/case/clang4_c.c-C-F0--var-backend.in
index 6e1bf19a..6e1bf19a 100644
--- a/test/cases/rlhc.d/case/clang4_c.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/clang4_c.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_c.c-C-F1--goto-backend.exp b/test/rlhc.d/case/clang4_c.c-C-F1--goto-backend.exp
index 4fb4cb43..4fb4cb43 100644
--- a/test/cases/rlhc.d/case/clang4_c.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/clang4_c.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_c.c-C-F1--goto-backend.in b/test/rlhc.d/case/clang4_c.c-C-F1--goto-backend.in
index 24584e1c..24584e1c 100644
--- a/test/cases/rlhc.d/case/clang4_c.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/clang4_c.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_c.c-C-F1--var-backend.exp b/test/rlhc.d/case/clang4_c.c-C-F1--var-backend.exp
index 78447514..78447514 100644
--- a/test/cases/rlhc.d/case/clang4_c.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/clang4_c.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_c.c-C-F1--var-backend.in b/test/rlhc.d/case/clang4_c.c-C-F1--var-backend.in
index c51149e2..c51149e2 100644
--- a/test/cases/rlhc.d/case/clang4_c.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/clang4_c.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_c.c-C-G0--goto-backend.exp b/test/rlhc.d/case/clang4_c.c-C-G0--goto-backend.exp
index bdfbb9a6..bdfbb9a6 100644
--- a/test/cases/rlhc.d/case/clang4_c.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/clang4_c.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_c.c-C-G0--goto-backend.in b/test/rlhc.d/case/clang4_c.c-C-G0--goto-backend.in
index 0281f8d7..0281f8d7 100644
--- a/test/cases/rlhc.d/case/clang4_c.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/clang4_c.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_c.c-C-G1--goto-backend.exp b/test/rlhc.d/case/clang4_c.c-C-G1--goto-backend.exp
index ed321116..ed321116 100644
--- a/test/cases/rlhc.d/case/clang4_c.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/clang4_c.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_c.c-C-G1--goto-backend.in b/test/rlhc.d/case/clang4_c.c-C-G1--goto-backend.in
index a04fe4fe..a04fe4fe 100644
--- a/test/cases/rlhc.d/case/clang4_c.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/clang4_c.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_c.c-C-G2--goto-backend.exp b/test/rlhc.d/case/clang4_c.c-C-G2--goto-backend.exp
index be3cf54e..be3cf54e 100644
--- a/test/cases/rlhc.d/case/clang4_c.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/clang4_c.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_c.c-C-G2--goto-backend.in b/test/rlhc.d/case/clang4_c.c-C-G2--goto-backend.in
index e1db9fb5..e1db9fb5 100644
--- a/test/cases/rlhc.d/case/clang4_c.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/clang4_c.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_c.c-C-T0--goto-backend.exp b/test/rlhc.d/case/clang4_c.c-C-T0--goto-backend.exp
index c82832c4..c82832c4 100644
--- a/test/cases/rlhc.d/case/clang4_c.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/clang4_c.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_c.c-C-T0--goto-backend.in b/test/rlhc.d/case/clang4_c.c-C-T0--goto-backend.in
index 9173056a..9173056a 100644
--- a/test/cases/rlhc.d/case/clang4_c.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/clang4_c.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_c.c-C-T0--var-backend.exp b/test/rlhc.d/case/clang4_c.c-C-T0--var-backend.exp
index 8c825a8f..8c825a8f 100644
--- a/test/cases/rlhc.d/case/clang4_c.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/clang4_c.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_c.c-C-T0--var-backend.in b/test/rlhc.d/case/clang4_c.c-C-T0--var-backend.in
index 85107e7e..85107e7e 100644
--- a/test/cases/rlhc.d/case/clang4_c.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/clang4_c.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_c.c-C-T1--goto-backend.exp b/test/rlhc.d/case/clang4_c.c-C-T1--goto-backend.exp
index ec03b0c8..ec03b0c8 100644
--- a/test/cases/rlhc.d/case/clang4_c.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/clang4_c.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_c.c-C-T1--goto-backend.in b/test/rlhc.d/case/clang4_c.c-C-T1--goto-backend.in
index d4f2e872..d4f2e872 100644
--- a/test/cases/rlhc.d/case/clang4_c.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/clang4_c.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_c.c-C-T1--var-backend.exp b/test/rlhc.d/case/clang4_c.c-C-T1--var-backend.exp
index cbdddb3c..cbdddb3c 100644
--- a/test/cases/rlhc.d/case/clang4_c.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/clang4_c.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_c.c-C-T1--var-backend.in b/test/rlhc.d/case/clang4_c.c-C-T1--var-backend.in
index 76028bf7..76028bf7 100644
--- a/test/cases/rlhc.d/case/clang4_c.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/clang4_c.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_crack.crk-K-F0--var-backend.exp b/test/rlhc.d/case/clang4_crack.crk-K-F0--var-backend.exp
index 4e06fe7f..4e06fe7f 100644
--- a/test/cases/rlhc.d/case/clang4_crack.crk-K-F0--var-backend.exp
+++ b/test/rlhc.d/case/clang4_crack.crk-K-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_crack.crk-K-F0--var-backend.in b/test/rlhc.d/case/clang4_crack.crk-K-F0--var-backend.in
index 21b32c26..21b32c26 100644
--- a/test/cases/rlhc.d/case/clang4_crack.crk-K-F0--var-backend.in
+++ b/test/rlhc.d/case/clang4_crack.crk-K-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_crack.crk-K-F1--var-backend.exp b/test/rlhc.d/case/clang4_crack.crk-K-F1--var-backend.exp
index da8f6f31..da8f6f31 100644
--- a/test/cases/rlhc.d/case/clang4_crack.crk-K-F1--var-backend.exp
+++ b/test/rlhc.d/case/clang4_crack.crk-K-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_crack.crk-K-F1--var-backend.in b/test/rlhc.d/case/clang4_crack.crk-K-F1--var-backend.in
index aac10144..aac10144 100644
--- a/test/cases/rlhc.d/case/clang4_crack.crk-K-F1--var-backend.in
+++ b/test/rlhc.d/case/clang4_crack.crk-K-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_crack.crk-K-T0--var-backend.exp b/test/rlhc.d/case/clang4_crack.crk-K-T0--var-backend.exp
index 8d8898c0..8d8898c0 100644
--- a/test/cases/rlhc.d/case/clang4_crack.crk-K-T0--var-backend.exp
+++ b/test/rlhc.d/case/clang4_crack.crk-K-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_crack.crk-K-T0--var-backend.in b/test/rlhc.d/case/clang4_crack.crk-K-T0--var-backend.in
index 97df6d18..97df6d18 100644
--- a/test/cases/rlhc.d/case/clang4_crack.crk-K-T0--var-backend.in
+++ b/test/rlhc.d/case/clang4_crack.crk-K-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_crack.crk-K-T1--var-backend.exp b/test/rlhc.d/case/clang4_crack.crk-K-T1--var-backend.exp
index ae40d41f..ae40d41f 100644
--- a/test/cases/rlhc.d/case/clang4_crack.crk-K-T1--var-backend.exp
+++ b/test/rlhc.d/case/clang4_crack.crk-K-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_crack.crk-K-T1--var-backend.in b/test/rlhc.d/case/clang4_crack.crk-K-T1--var-backend.in
index 96668b72..96668b72 100644
--- a/test/cases/rlhc.d/case/clang4_crack.crk-K-T1--var-backend.in
+++ b/test/rlhc.d/case/clang4_crack.crk-K-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_cs.cs-A-F0--goto-backend.exp b/test/rlhc.d/case/clang4_cs.cs-A-F0--goto-backend.exp
index db09591d..db09591d 100644
--- a/test/cases/rlhc.d/case/clang4_cs.cs-A-F0--goto-backend.exp
+++ b/test/rlhc.d/case/clang4_cs.cs-A-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_cs.cs-A-F0--goto-backend.in b/test/rlhc.d/case/clang4_cs.cs-A-F0--goto-backend.in
index 052c1b01..052c1b01 100644
--- a/test/cases/rlhc.d/case/clang4_cs.cs-A-F0--goto-backend.in
+++ b/test/rlhc.d/case/clang4_cs.cs-A-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_cs.cs-A-F0--var-backend.exp b/test/rlhc.d/case/clang4_cs.cs-A-F0--var-backend.exp
index 5a087943..5a087943 100644
--- a/test/cases/rlhc.d/case/clang4_cs.cs-A-F0--var-backend.exp
+++ b/test/rlhc.d/case/clang4_cs.cs-A-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_cs.cs-A-F0--var-backend.in b/test/rlhc.d/case/clang4_cs.cs-A-F0--var-backend.in
index 2d2e424b..2d2e424b 100644
--- a/test/cases/rlhc.d/case/clang4_cs.cs-A-F0--var-backend.in
+++ b/test/rlhc.d/case/clang4_cs.cs-A-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_cs.cs-A-F1--goto-backend.exp b/test/rlhc.d/case/clang4_cs.cs-A-F1--goto-backend.exp
index aca95a58..aca95a58 100644
--- a/test/cases/rlhc.d/case/clang4_cs.cs-A-F1--goto-backend.exp
+++ b/test/rlhc.d/case/clang4_cs.cs-A-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_cs.cs-A-F1--goto-backend.in b/test/rlhc.d/case/clang4_cs.cs-A-F1--goto-backend.in
index f61adb8a..f61adb8a 100644
--- a/test/cases/rlhc.d/case/clang4_cs.cs-A-F1--goto-backend.in
+++ b/test/rlhc.d/case/clang4_cs.cs-A-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_cs.cs-A-F1--var-backend.exp b/test/rlhc.d/case/clang4_cs.cs-A-F1--var-backend.exp
index 758a9a6e..758a9a6e 100644
--- a/test/cases/rlhc.d/case/clang4_cs.cs-A-F1--var-backend.exp
+++ b/test/rlhc.d/case/clang4_cs.cs-A-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_cs.cs-A-F1--var-backend.in b/test/rlhc.d/case/clang4_cs.cs-A-F1--var-backend.in
index 95a9265e..95a9265e 100644
--- a/test/cases/rlhc.d/case/clang4_cs.cs-A-F1--var-backend.in
+++ b/test/rlhc.d/case/clang4_cs.cs-A-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_cs.cs-A-G0--goto-backend.exp b/test/rlhc.d/case/clang4_cs.cs-A-G0--goto-backend.exp
index 063660cd..063660cd 100644
--- a/test/cases/rlhc.d/case/clang4_cs.cs-A-G0--goto-backend.exp
+++ b/test/rlhc.d/case/clang4_cs.cs-A-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_cs.cs-A-G0--goto-backend.in b/test/rlhc.d/case/clang4_cs.cs-A-G0--goto-backend.in
index f4c10f77..f4c10f77 100644
--- a/test/cases/rlhc.d/case/clang4_cs.cs-A-G0--goto-backend.in
+++ b/test/rlhc.d/case/clang4_cs.cs-A-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_cs.cs-A-G1--goto-backend.exp b/test/rlhc.d/case/clang4_cs.cs-A-G1--goto-backend.exp
index 18fda1a5..18fda1a5 100644
--- a/test/cases/rlhc.d/case/clang4_cs.cs-A-G1--goto-backend.exp
+++ b/test/rlhc.d/case/clang4_cs.cs-A-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_cs.cs-A-G1--goto-backend.in b/test/rlhc.d/case/clang4_cs.cs-A-G1--goto-backend.in
index 203e50b9..203e50b9 100644
--- a/test/cases/rlhc.d/case/clang4_cs.cs-A-G1--goto-backend.in
+++ b/test/rlhc.d/case/clang4_cs.cs-A-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_cs.cs-A-T0--goto-backend.exp b/test/rlhc.d/case/clang4_cs.cs-A-T0--goto-backend.exp
index 24496516..24496516 100644
--- a/test/cases/rlhc.d/case/clang4_cs.cs-A-T0--goto-backend.exp
+++ b/test/rlhc.d/case/clang4_cs.cs-A-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_cs.cs-A-T0--goto-backend.in b/test/rlhc.d/case/clang4_cs.cs-A-T0--goto-backend.in
index dc50c646..dc50c646 100644
--- a/test/cases/rlhc.d/case/clang4_cs.cs-A-T0--goto-backend.in
+++ b/test/rlhc.d/case/clang4_cs.cs-A-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_cs.cs-A-T0--var-backend.exp b/test/rlhc.d/case/clang4_cs.cs-A-T0--var-backend.exp
index 67e00fc8..67e00fc8 100644
--- a/test/cases/rlhc.d/case/clang4_cs.cs-A-T0--var-backend.exp
+++ b/test/rlhc.d/case/clang4_cs.cs-A-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_cs.cs-A-T0--var-backend.in b/test/rlhc.d/case/clang4_cs.cs-A-T0--var-backend.in
index 05c5709b..05c5709b 100644
--- a/test/cases/rlhc.d/case/clang4_cs.cs-A-T0--var-backend.in
+++ b/test/rlhc.d/case/clang4_cs.cs-A-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_cs.cs-A-T1--goto-backend.exp b/test/rlhc.d/case/clang4_cs.cs-A-T1--goto-backend.exp
index 711d7250..711d7250 100644
--- a/test/cases/rlhc.d/case/clang4_cs.cs-A-T1--goto-backend.exp
+++ b/test/rlhc.d/case/clang4_cs.cs-A-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_cs.cs-A-T1--goto-backend.in b/test/rlhc.d/case/clang4_cs.cs-A-T1--goto-backend.in
index 17b22874..17b22874 100644
--- a/test/cases/rlhc.d/case/clang4_cs.cs-A-T1--goto-backend.in
+++ b/test/rlhc.d/case/clang4_cs.cs-A-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_cs.cs-A-T1--var-backend.exp b/test/rlhc.d/case/clang4_cs.cs-A-T1--var-backend.exp
index ef400788..ef400788 100644
--- a/test/cases/rlhc.d/case/clang4_cs.cs-A-T1--var-backend.exp
+++ b/test/rlhc.d/case/clang4_cs.cs-A-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_cs.cs-A-T1--var-backend.in b/test/rlhc.d/case/clang4_cs.cs-A-T1--var-backend.in
index aa16ea76..aa16ea76 100644
--- a/test/cases/rlhc.d/case/clang4_cs.cs-A-T1--var-backend.in
+++ b/test/rlhc.d/case/clang4_cs.cs-A-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_go.go-Z-F0--goto-backend.exp b/test/rlhc.d/case/clang4_go.go-Z-F0--goto-backend.exp
index b8707bf1..b8707bf1 100644
--- a/test/cases/rlhc.d/case/clang4_go.go-Z-F0--goto-backend.exp
+++ b/test/rlhc.d/case/clang4_go.go-Z-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_go.go-Z-F0--goto-backend.in b/test/rlhc.d/case/clang4_go.go-Z-F0--goto-backend.in
index cc9bad94..cc9bad94 100644
--- a/test/cases/rlhc.d/case/clang4_go.go-Z-F0--goto-backend.in
+++ b/test/rlhc.d/case/clang4_go.go-Z-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_go.go-Z-F0--var-backend.exp b/test/rlhc.d/case/clang4_go.go-Z-F0--var-backend.exp
index 15d7b9e1..15d7b9e1 100644
--- a/test/cases/rlhc.d/case/clang4_go.go-Z-F0--var-backend.exp
+++ b/test/rlhc.d/case/clang4_go.go-Z-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_go.go-Z-F0--var-backend.in b/test/rlhc.d/case/clang4_go.go-Z-F0--var-backend.in
index 56c15e13..56c15e13 100644
--- a/test/cases/rlhc.d/case/clang4_go.go-Z-F0--var-backend.in
+++ b/test/rlhc.d/case/clang4_go.go-Z-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_go.go-Z-F1--goto-backend.exp b/test/rlhc.d/case/clang4_go.go-Z-F1--goto-backend.exp
index 68185fd2..68185fd2 100644
--- a/test/cases/rlhc.d/case/clang4_go.go-Z-F1--goto-backend.exp
+++ b/test/rlhc.d/case/clang4_go.go-Z-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_go.go-Z-F1--goto-backend.in b/test/rlhc.d/case/clang4_go.go-Z-F1--goto-backend.in
index 0fb17733..0fb17733 100644
--- a/test/cases/rlhc.d/case/clang4_go.go-Z-F1--goto-backend.in
+++ b/test/rlhc.d/case/clang4_go.go-Z-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_go.go-Z-F1--var-backend.exp b/test/rlhc.d/case/clang4_go.go-Z-F1--var-backend.exp
index af9c2092..af9c2092 100644
--- a/test/cases/rlhc.d/case/clang4_go.go-Z-F1--var-backend.exp
+++ b/test/rlhc.d/case/clang4_go.go-Z-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_go.go-Z-F1--var-backend.in b/test/rlhc.d/case/clang4_go.go-Z-F1--var-backend.in
index 426538b3..426538b3 100644
--- a/test/cases/rlhc.d/case/clang4_go.go-Z-F1--var-backend.in
+++ b/test/rlhc.d/case/clang4_go.go-Z-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_go.go-Z-G0--goto-backend.exp b/test/rlhc.d/case/clang4_go.go-Z-G0--goto-backend.exp
index 516ecd87..516ecd87 100644
--- a/test/cases/rlhc.d/case/clang4_go.go-Z-G0--goto-backend.exp
+++ b/test/rlhc.d/case/clang4_go.go-Z-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_go.go-Z-G0--goto-backend.in b/test/rlhc.d/case/clang4_go.go-Z-G0--goto-backend.in
index 4d47ef6b..4d47ef6b 100644
--- a/test/cases/rlhc.d/case/clang4_go.go-Z-G0--goto-backend.in
+++ b/test/rlhc.d/case/clang4_go.go-Z-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_go.go-Z-G1--goto-backend.exp b/test/rlhc.d/case/clang4_go.go-Z-G1--goto-backend.exp
index 84252926..84252926 100644
--- a/test/cases/rlhc.d/case/clang4_go.go-Z-G1--goto-backend.exp
+++ b/test/rlhc.d/case/clang4_go.go-Z-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_go.go-Z-G1--goto-backend.in b/test/rlhc.d/case/clang4_go.go-Z-G1--goto-backend.in
index 2b6ce412..2b6ce412 100644
--- a/test/cases/rlhc.d/case/clang4_go.go-Z-G1--goto-backend.in
+++ b/test/rlhc.d/case/clang4_go.go-Z-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_go.go-Z-G2--goto-backend.exp b/test/rlhc.d/case/clang4_go.go-Z-G2--goto-backend.exp
index 8e5c3277..8e5c3277 100644
--- a/test/cases/rlhc.d/case/clang4_go.go-Z-G2--goto-backend.exp
+++ b/test/rlhc.d/case/clang4_go.go-Z-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_go.go-Z-G2--goto-backend.in b/test/rlhc.d/case/clang4_go.go-Z-G2--goto-backend.in
index 444b4a6b..444b4a6b 100644
--- a/test/cases/rlhc.d/case/clang4_go.go-Z-G2--goto-backend.in
+++ b/test/rlhc.d/case/clang4_go.go-Z-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_go.go-Z-T0--goto-backend.exp b/test/rlhc.d/case/clang4_go.go-Z-T0--goto-backend.exp
index c00e9d17..c00e9d17 100644
--- a/test/cases/rlhc.d/case/clang4_go.go-Z-T0--goto-backend.exp
+++ b/test/rlhc.d/case/clang4_go.go-Z-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_go.go-Z-T0--goto-backend.in b/test/rlhc.d/case/clang4_go.go-Z-T0--goto-backend.in
index af92256d..af92256d 100644
--- a/test/cases/rlhc.d/case/clang4_go.go-Z-T0--goto-backend.in
+++ b/test/rlhc.d/case/clang4_go.go-Z-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_go.go-Z-T0--var-backend.exp b/test/rlhc.d/case/clang4_go.go-Z-T0--var-backend.exp
index f353f65e..f353f65e 100644
--- a/test/cases/rlhc.d/case/clang4_go.go-Z-T0--var-backend.exp
+++ b/test/rlhc.d/case/clang4_go.go-Z-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_go.go-Z-T0--var-backend.in b/test/rlhc.d/case/clang4_go.go-Z-T0--var-backend.in
index 3d781b29..3d781b29 100644
--- a/test/cases/rlhc.d/case/clang4_go.go-Z-T0--var-backend.in
+++ b/test/rlhc.d/case/clang4_go.go-Z-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_go.go-Z-T1--goto-backend.exp b/test/rlhc.d/case/clang4_go.go-Z-T1--goto-backend.exp
index 81a180ff..81a180ff 100644
--- a/test/cases/rlhc.d/case/clang4_go.go-Z-T1--goto-backend.exp
+++ b/test/rlhc.d/case/clang4_go.go-Z-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_go.go-Z-T1--goto-backend.in b/test/rlhc.d/case/clang4_go.go-Z-T1--goto-backend.in
index 6a72ac13..6a72ac13 100644
--- a/test/cases/rlhc.d/case/clang4_go.go-Z-T1--goto-backend.in
+++ b/test/rlhc.d/case/clang4_go.go-Z-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_go.go-Z-T1--var-backend.exp b/test/rlhc.d/case/clang4_go.go-Z-T1--var-backend.exp
index 127f1b95..127f1b95 100644
--- a/test/cases/rlhc.d/case/clang4_go.go-Z-T1--var-backend.exp
+++ b/test/rlhc.d/case/clang4_go.go-Z-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_go.go-Z-T1--var-backend.in b/test/rlhc.d/case/clang4_go.go-Z-T1--var-backend.in
index be307612..be307612 100644
--- a/test/cases/rlhc.d/case/clang4_go.go-Z-T1--var-backend.in
+++ b/test/rlhc.d/case/clang4_go.go-Z-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_java.java-J-F0--goto-backend.exp b/test/rlhc.d/case/clang4_java.java-J-F0--goto-backend.exp
index 78f69479..78f69479 100644
--- a/test/cases/rlhc.d/case/clang4_java.java-J-F0--goto-backend.exp
+++ b/test/rlhc.d/case/clang4_java.java-J-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_java.java-J-F0--goto-backend.in b/test/rlhc.d/case/clang4_java.java-J-F0--goto-backend.in
index 913a19f5..913a19f5 100644
--- a/test/cases/rlhc.d/case/clang4_java.java-J-F0--goto-backend.in
+++ b/test/rlhc.d/case/clang4_java.java-J-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_java.java-J-F0--var-backend.exp b/test/rlhc.d/case/clang4_java.java-J-F0--var-backend.exp
index 18cbfbd9..18cbfbd9 100644
--- a/test/cases/rlhc.d/case/clang4_java.java-J-F0--var-backend.exp
+++ b/test/rlhc.d/case/clang4_java.java-J-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_java.java-J-F0--var-backend.in b/test/rlhc.d/case/clang4_java.java-J-F0--var-backend.in
index 7f1190b8..7f1190b8 100644
--- a/test/cases/rlhc.d/case/clang4_java.java-J-F0--var-backend.in
+++ b/test/rlhc.d/case/clang4_java.java-J-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_java.java-J-F1--goto-backend.exp b/test/rlhc.d/case/clang4_java.java-J-F1--goto-backend.exp
index b2bb7a17..b2bb7a17 100644
--- a/test/cases/rlhc.d/case/clang4_java.java-J-F1--goto-backend.exp
+++ b/test/rlhc.d/case/clang4_java.java-J-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_java.java-J-F1--goto-backend.in b/test/rlhc.d/case/clang4_java.java-J-F1--goto-backend.in
index c9ebe42d..c9ebe42d 100644
--- a/test/cases/rlhc.d/case/clang4_java.java-J-F1--goto-backend.in
+++ b/test/rlhc.d/case/clang4_java.java-J-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_java.java-J-F1--var-backend.exp b/test/rlhc.d/case/clang4_java.java-J-F1--var-backend.exp
index 619ef645..619ef645 100644
--- a/test/cases/rlhc.d/case/clang4_java.java-J-F1--var-backend.exp
+++ b/test/rlhc.d/case/clang4_java.java-J-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_java.java-J-F1--var-backend.in b/test/rlhc.d/case/clang4_java.java-J-F1--var-backend.in
index 1fa027c6..1fa027c6 100644
--- a/test/cases/rlhc.d/case/clang4_java.java-J-F1--var-backend.in
+++ b/test/rlhc.d/case/clang4_java.java-J-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_java.java-J-T0--goto-backend.exp b/test/rlhc.d/case/clang4_java.java-J-T0--goto-backend.exp
index ee72a5b0..ee72a5b0 100644
--- a/test/cases/rlhc.d/case/clang4_java.java-J-T0--goto-backend.exp
+++ b/test/rlhc.d/case/clang4_java.java-J-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_java.java-J-T0--goto-backend.in b/test/rlhc.d/case/clang4_java.java-J-T0--goto-backend.in
index 6e8414e4..6e8414e4 100644
--- a/test/cases/rlhc.d/case/clang4_java.java-J-T0--goto-backend.in
+++ b/test/rlhc.d/case/clang4_java.java-J-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_java.java-J-T0--var-backend.exp b/test/rlhc.d/case/clang4_java.java-J-T0--var-backend.exp
index 4b6575d5..4b6575d5 100644
--- a/test/cases/rlhc.d/case/clang4_java.java-J-T0--var-backend.exp
+++ b/test/rlhc.d/case/clang4_java.java-J-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_java.java-J-T0--var-backend.in b/test/rlhc.d/case/clang4_java.java-J-T0--var-backend.in
index c0fb8e64..c0fb8e64 100644
--- a/test/cases/rlhc.d/case/clang4_java.java-J-T0--var-backend.in
+++ b/test/rlhc.d/case/clang4_java.java-J-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_java.java-J-T1--goto-backend.exp b/test/rlhc.d/case/clang4_java.java-J-T1--goto-backend.exp
index 8949c1b6..8949c1b6 100644
--- a/test/cases/rlhc.d/case/clang4_java.java-J-T1--goto-backend.exp
+++ b/test/rlhc.d/case/clang4_java.java-J-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_java.java-J-T1--goto-backend.in b/test/rlhc.d/case/clang4_java.java-J-T1--goto-backend.in
index dc2cf462..dc2cf462 100644
--- a/test/cases/rlhc.d/case/clang4_java.java-J-T1--goto-backend.in
+++ b/test/rlhc.d/case/clang4_java.java-J-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_java.java-J-T1--var-backend.exp b/test/rlhc.d/case/clang4_java.java-J-T1--var-backend.exp
index 456496d8..456496d8 100644
--- a/test/cases/rlhc.d/case/clang4_java.java-J-T1--var-backend.exp
+++ b/test/rlhc.d/case/clang4_java.java-J-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_java.java-J-T1--var-backend.in b/test/rlhc.d/case/clang4_java.java-J-T1--var-backend.in
index a5e9f23a..a5e9f23a 100644
--- a/test/cases/rlhc.d/case/clang4_java.java-J-T1--var-backend.in
+++ b/test/rlhc.d/case/clang4_java.java-J-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_julia.jl-Y-F0--var-backend.exp b/test/rlhc.d/case/clang4_julia.jl-Y-F0--var-backend.exp
index 9cf9fdf7..9cf9fdf7 100644
--- a/test/cases/rlhc.d/case/clang4_julia.jl-Y-F0--var-backend.exp
+++ b/test/rlhc.d/case/clang4_julia.jl-Y-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_julia.jl-Y-F0--var-backend.in b/test/rlhc.d/case/clang4_julia.jl-Y-F0--var-backend.in
index f218b18e..f218b18e 100644
--- a/test/cases/rlhc.d/case/clang4_julia.jl-Y-F0--var-backend.in
+++ b/test/rlhc.d/case/clang4_julia.jl-Y-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_julia.jl-Y-F1--var-backend.exp b/test/rlhc.d/case/clang4_julia.jl-Y-F1--var-backend.exp
index d4bedd11..d4bedd11 100644
--- a/test/cases/rlhc.d/case/clang4_julia.jl-Y-F1--var-backend.exp
+++ b/test/rlhc.d/case/clang4_julia.jl-Y-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_julia.jl-Y-F1--var-backend.in b/test/rlhc.d/case/clang4_julia.jl-Y-F1--var-backend.in
index b884bbcd..b884bbcd 100644
--- a/test/cases/rlhc.d/case/clang4_julia.jl-Y-F1--var-backend.in
+++ b/test/rlhc.d/case/clang4_julia.jl-Y-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_julia.jl-Y-T0--var-backend.exp b/test/rlhc.d/case/clang4_julia.jl-Y-T0--var-backend.exp
index b9286ed3..b9286ed3 100644
--- a/test/cases/rlhc.d/case/clang4_julia.jl-Y-T0--var-backend.exp
+++ b/test/rlhc.d/case/clang4_julia.jl-Y-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_julia.jl-Y-T0--var-backend.in b/test/rlhc.d/case/clang4_julia.jl-Y-T0--var-backend.in
index 3fc7c581..3fc7c581 100644
--- a/test/cases/rlhc.d/case/clang4_julia.jl-Y-T0--var-backend.in
+++ b/test/rlhc.d/case/clang4_julia.jl-Y-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_julia.jl-Y-T1--var-backend.exp b/test/rlhc.d/case/clang4_julia.jl-Y-T1--var-backend.exp
index be49dc66..be49dc66 100644
--- a/test/cases/rlhc.d/case/clang4_julia.jl-Y-T1--var-backend.exp
+++ b/test/rlhc.d/case/clang4_julia.jl-Y-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_julia.jl-Y-T1--var-backend.in b/test/rlhc.d/case/clang4_julia.jl-Y-T1--var-backend.in
index 633d2b2e..633d2b2e 100644
--- a/test/cases/rlhc.d/case/clang4_julia.jl-Y-T1--var-backend.in
+++ b/test/rlhc.d/case/clang4_julia.jl-Y-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_ocaml.ml-O-F0--var-backend.exp b/test/rlhc.d/case/clang4_ocaml.ml-O-F0--var-backend.exp
index 2c464bba..2c464bba 100644
--- a/test/cases/rlhc.d/case/clang4_ocaml.ml-O-F0--var-backend.exp
+++ b/test/rlhc.d/case/clang4_ocaml.ml-O-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_ocaml.ml-O-F0--var-backend.in b/test/rlhc.d/case/clang4_ocaml.ml-O-F0--var-backend.in
index a7d16d63..a7d16d63 100644
--- a/test/cases/rlhc.d/case/clang4_ocaml.ml-O-F0--var-backend.in
+++ b/test/rlhc.d/case/clang4_ocaml.ml-O-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_ocaml.ml-O-F1--var-backend.exp b/test/rlhc.d/case/clang4_ocaml.ml-O-F1--var-backend.exp
index a6393a50..a6393a50 100644
--- a/test/cases/rlhc.d/case/clang4_ocaml.ml-O-F1--var-backend.exp
+++ b/test/rlhc.d/case/clang4_ocaml.ml-O-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_ocaml.ml-O-F1--var-backend.in b/test/rlhc.d/case/clang4_ocaml.ml-O-F1--var-backend.in
index 20e0bf0d..20e0bf0d 100644
--- a/test/cases/rlhc.d/case/clang4_ocaml.ml-O-F1--var-backend.in
+++ b/test/rlhc.d/case/clang4_ocaml.ml-O-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_ocaml.ml-O-T0--var-backend.exp b/test/rlhc.d/case/clang4_ocaml.ml-O-T0--var-backend.exp
index e6e974f1..e6e974f1 100644
--- a/test/cases/rlhc.d/case/clang4_ocaml.ml-O-T0--var-backend.exp
+++ b/test/rlhc.d/case/clang4_ocaml.ml-O-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_ocaml.ml-O-T0--var-backend.in b/test/rlhc.d/case/clang4_ocaml.ml-O-T0--var-backend.in
index 2f0dcff6..2f0dcff6 100644
--- a/test/cases/rlhc.d/case/clang4_ocaml.ml-O-T0--var-backend.in
+++ b/test/rlhc.d/case/clang4_ocaml.ml-O-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_ocaml.ml-O-T1--var-backend.exp b/test/rlhc.d/case/clang4_ocaml.ml-O-T1--var-backend.exp
index 03e334ae..03e334ae 100644
--- a/test/cases/rlhc.d/case/clang4_ocaml.ml-O-T1--var-backend.exp
+++ b/test/rlhc.d/case/clang4_ocaml.ml-O-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_ocaml.ml-O-T1--var-backend.in b/test/rlhc.d/case/clang4_ocaml.ml-O-T1--var-backend.in
index eb31dc46..eb31dc46 100644
--- a/test/cases/rlhc.d/case/clang4_ocaml.ml-O-T1--var-backend.in
+++ b/test/rlhc.d/case/clang4_ocaml.ml-O-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_ruby.rb-R-F0--var-backend.exp b/test/rlhc.d/case/clang4_ruby.rb-R-F0--var-backend.exp
index 050d9706..050d9706 100644
--- a/test/cases/rlhc.d/case/clang4_ruby.rb-R-F0--var-backend.exp
+++ b/test/rlhc.d/case/clang4_ruby.rb-R-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_ruby.rb-R-F0--var-backend.in b/test/rlhc.d/case/clang4_ruby.rb-R-F0--var-backend.in
index 349d8e17..349d8e17 100644
--- a/test/cases/rlhc.d/case/clang4_ruby.rb-R-F0--var-backend.in
+++ b/test/rlhc.d/case/clang4_ruby.rb-R-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_ruby.rb-R-F1--var-backend.exp b/test/rlhc.d/case/clang4_ruby.rb-R-F1--var-backend.exp
index 79dfd295..79dfd295 100644
--- a/test/cases/rlhc.d/case/clang4_ruby.rb-R-F1--var-backend.exp
+++ b/test/rlhc.d/case/clang4_ruby.rb-R-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_ruby.rb-R-F1--var-backend.in b/test/rlhc.d/case/clang4_ruby.rb-R-F1--var-backend.in
index 392f8fc1..392f8fc1 100644
--- a/test/cases/rlhc.d/case/clang4_ruby.rb-R-F1--var-backend.in
+++ b/test/rlhc.d/case/clang4_ruby.rb-R-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_ruby.rb-R-T0--var-backend.exp b/test/rlhc.d/case/clang4_ruby.rb-R-T0--var-backend.exp
index b7d68d69..b7d68d69 100644
--- a/test/cases/rlhc.d/case/clang4_ruby.rb-R-T0--var-backend.exp
+++ b/test/rlhc.d/case/clang4_ruby.rb-R-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_ruby.rb-R-T0--var-backend.in b/test/rlhc.d/case/clang4_ruby.rb-R-T0--var-backend.in
index 4bff472c..4bff472c 100644
--- a/test/cases/rlhc.d/case/clang4_ruby.rb-R-T0--var-backend.in
+++ b/test/rlhc.d/case/clang4_ruby.rb-R-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_ruby.rb-R-T1--var-backend.exp b/test/rlhc.d/case/clang4_ruby.rb-R-T1--var-backend.exp
index a89c7f5b..a89c7f5b 100644
--- a/test/cases/rlhc.d/case/clang4_ruby.rb-R-T1--var-backend.exp
+++ b/test/rlhc.d/case/clang4_ruby.rb-R-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_ruby.rb-R-T1--var-backend.in b/test/rlhc.d/case/clang4_ruby.rb-R-T1--var-backend.in
index 0d084bb9..0d084bb9 100644
--- a/test/cases/rlhc.d/case/clang4_ruby.rb-R-T1--var-backend.in
+++ b/test/rlhc.d/case/clang4_ruby.rb-R-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_rust.rs-U-F0--var-backend.exp b/test/rlhc.d/case/clang4_rust.rs-U-F0--var-backend.exp
index cb959b39..cb959b39 100644
--- a/test/cases/rlhc.d/case/clang4_rust.rs-U-F0--var-backend.exp
+++ b/test/rlhc.d/case/clang4_rust.rs-U-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_rust.rs-U-F0--var-backend.in b/test/rlhc.d/case/clang4_rust.rs-U-F0--var-backend.in
index 1eee5c58..1eee5c58 100644
--- a/test/cases/rlhc.d/case/clang4_rust.rs-U-F0--var-backend.in
+++ b/test/rlhc.d/case/clang4_rust.rs-U-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_rust.rs-U-F1--var-backend.exp b/test/rlhc.d/case/clang4_rust.rs-U-F1--var-backend.exp
index 1aeabfe0..1aeabfe0 100644
--- a/test/cases/rlhc.d/case/clang4_rust.rs-U-F1--var-backend.exp
+++ b/test/rlhc.d/case/clang4_rust.rs-U-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_rust.rs-U-F1--var-backend.in b/test/rlhc.d/case/clang4_rust.rs-U-F1--var-backend.in
index dac11e77..dac11e77 100644
--- a/test/cases/rlhc.d/case/clang4_rust.rs-U-F1--var-backend.in
+++ b/test/rlhc.d/case/clang4_rust.rs-U-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_rust.rs-U-T0--var-backend.exp b/test/rlhc.d/case/clang4_rust.rs-U-T0--var-backend.exp
index 814d414f..814d414f 100644
--- a/test/cases/rlhc.d/case/clang4_rust.rs-U-T0--var-backend.exp
+++ b/test/rlhc.d/case/clang4_rust.rs-U-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_rust.rs-U-T0--var-backend.in b/test/rlhc.d/case/clang4_rust.rs-U-T0--var-backend.in
index 093a823d..093a823d 100644
--- a/test/cases/rlhc.d/case/clang4_rust.rs-U-T0--var-backend.in
+++ b/test/rlhc.d/case/clang4_rust.rs-U-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang4_rust.rs-U-T1--var-backend.exp b/test/rlhc.d/case/clang4_rust.rs-U-T1--var-backend.exp
index 63b1cc4a..63b1cc4a 100644
--- a/test/cases/rlhc.d/case/clang4_rust.rs-U-T1--var-backend.exp
+++ b/test/rlhc.d/case/clang4_rust.rs-U-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang4_rust.rs-U-T1--var-backend.in b/test/rlhc.d/case/clang4_rust.rs-U-T1--var-backend.in
index ffe8ba85..ffe8ba85 100644
--- a/test/cases/rlhc.d/case/clang4_rust.rs-U-T1--var-backend.in
+++ b/test/rlhc.d/case/clang4_rust.rs-U-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang5.ml-O-F0--var-backend.exp b/test/rlhc.d/case/clang5.ml-O-F0--var-backend.exp
index e21966fd..e21966fd 100644
--- a/test/cases/rlhc.d/case/clang5.ml-O-F0--var-backend.exp
+++ b/test/rlhc.d/case/clang5.ml-O-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang5.ml-O-F0--var-backend.in b/test/rlhc.d/case/clang5.ml-O-F0--var-backend.in
index 38be6e2f..38be6e2f 100644
--- a/test/cases/rlhc.d/case/clang5.ml-O-F0--var-backend.in
+++ b/test/rlhc.d/case/clang5.ml-O-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang5.ml-O-F1--var-backend.exp b/test/rlhc.d/case/clang5.ml-O-F1--var-backend.exp
index 556d8907..556d8907 100644
--- a/test/cases/rlhc.d/case/clang5.ml-O-F1--var-backend.exp
+++ b/test/rlhc.d/case/clang5.ml-O-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang5.ml-O-F1--var-backend.in b/test/rlhc.d/case/clang5.ml-O-F1--var-backend.in
index c037b000..c037b000 100644
--- a/test/cases/rlhc.d/case/clang5.ml-O-F1--var-backend.in
+++ b/test/rlhc.d/case/clang5.ml-O-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang5.ml-O-T0--var-backend.exp b/test/rlhc.d/case/clang5.ml-O-T0--var-backend.exp
index da0460fa..da0460fa 100644
--- a/test/cases/rlhc.d/case/clang5.ml-O-T0--var-backend.exp
+++ b/test/rlhc.d/case/clang5.ml-O-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang5.ml-O-T0--var-backend.in b/test/rlhc.d/case/clang5.ml-O-T0--var-backend.in
index b8f40432..b8f40432 100644
--- a/test/cases/rlhc.d/case/clang5.ml-O-T0--var-backend.in
+++ b/test/rlhc.d/case/clang5.ml-O-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/clang5.ml-O-T1--var-backend.exp b/test/rlhc.d/case/clang5.ml-O-T1--var-backend.exp
index 415052d5..415052d5 100644
--- a/test/cases/rlhc.d/case/clang5.ml-O-T1--var-backend.exp
+++ b/test/rlhc.d/case/clang5.ml-O-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/clang5.ml-O-T1--var-backend.in b/test/rlhc.d/case/clang5.ml-O-T1--var-backend.in
index 0d8bb8d8..0d8bb8d8 100644
--- a/test/cases/rlhc.d/case/clang5.ml-O-T1--var-backend.in
+++ b/test/rlhc.d/case/clang5.ml-O-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond10.cpp-C-F0--goto-backend.exp b/test/rlhc.d/case/cond10.cpp-C-F0--goto-backend.exp
index f4b4fbff..f4b4fbff 100644
--- a/test/cases/rlhc.d/case/cond10.cpp-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/cond10.cpp-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond10.cpp-C-F0--goto-backend.in b/test/rlhc.d/case/cond10.cpp-C-F0--goto-backend.in
index 06b1df5a..06b1df5a 100644
--- a/test/cases/rlhc.d/case/cond10.cpp-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/cond10.cpp-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond10.cpp-C-F0--var-backend.exp b/test/rlhc.d/case/cond10.cpp-C-F0--var-backend.exp
index 2febe348..2febe348 100644
--- a/test/cases/rlhc.d/case/cond10.cpp-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/cond10.cpp-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond10.cpp-C-F0--var-backend.in b/test/rlhc.d/case/cond10.cpp-C-F0--var-backend.in
index d1eaee0d..d1eaee0d 100644
--- a/test/cases/rlhc.d/case/cond10.cpp-C-F0--var-backend.in
+++ b/test/rlhc.d/case/cond10.cpp-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond10.cpp-C-F1--goto-backend.exp b/test/rlhc.d/case/cond10.cpp-C-F1--goto-backend.exp
index 11ad5f6a..11ad5f6a 100644
--- a/test/cases/rlhc.d/case/cond10.cpp-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/cond10.cpp-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond10.cpp-C-F1--goto-backend.in b/test/rlhc.d/case/cond10.cpp-C-F1--goto-backend.in
index 1e879f39..1e879f39 100644
--- a/test/cases/rlhc.d/case/cond10.cpp-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/cond10.cpp-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond10.cpp-C-F1--var-backend.exp b/test/rlhc.d/case/cond10.cpp-C-F1--var-backend.exp
index 0870aa8a..0870aa8a 100644
--- a/test/cases/rlhc.d/case/cond10.cpp-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/cond10.cpp-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond10.cpp-C-F1--var-backend.in b/test/rlhc.d/case/cond10.cpp-C-F1--var-backend.in
index 73bb5729..73bb5729 100644
--- a/test/cases/rlhc.d/case/cond10.cpp-C-F1--var-backend.in
+++ b/test/rlhc.d/case/cond10.cpp-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond10.cpp-C-G0--goto-backend.exp b/test/rlhc.d/case/cond10.cpp-C-G0--goto-backend.exp
index 120d7c42..120d7c42 100644
--- a/test/cases/rlhc.d/case/cond10.cpp-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/cond10.cpp-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond10.cpp-C-G0--goto-backend.in b/test/rlhc.d/case/cond10.cpp-C-G0--goto-backend.in
index e586df42..e586df42 100644
--- a/test/cases/rlhc.d/case/cond10.cpp-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/cond10.cpp-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond10.cpp-C-G1--goto-backend.exp b/test/rlhc.d/case/cond10.cpp-C-G1--goto-backend.exp
index dc89e2f7..dc89e2f7 100644
--- a/test/cases/rlhc.d/case/cond10.cpp-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/cond10.cpp-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond10.cpp-C-G1--goto-backend.in b/test/rlhc.d/case/cond10.cpp-C-G1--goto-backend.in
index 11ab81e5..11ab81e5 100644
--- a/test/cases/rlhc.d/case/cond10.cpp-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/cond10.cpp-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond10.cpp-C-G2--goto-backend.exp b/test/rlhc.d/case/cond10.cpp-C-G2--goto-backend.exp
index fd725405..fd725405 100644
--- a/test/cases/rlhc.d/case/cond10.cpp-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/cond10.cpp-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond10.cpp-C-G2--goto-backend.in b/test/rlhc.d/case/cond10.cpp-C-G2--goto-backend.in
index c8418c2c..c8418c2c 100644
--- a/test/cases/rlhc.d/case/cond10.cpp-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/cond10.cpp-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond10.cpp-C-T0--goto-backend.exp b/test/rlhc.d/case/cond10.cpp-C-T0--goto-backend.exp
index a503878b..a503878b 100644
--- a/test/cases/rlhc.d/case/cond10.cpp-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/cond10.cpp-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond10.cpp-C-T0--goto-backend.in b/test/rlhc.d/case/cond10.cpp-C-T0--goto-backend.in
index 8281ec92..8281ec92 100644
--- a/test/cases/rlhc.d/case/cond10.cpp-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/cond10.cpp-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond10.cpp-C-T0--var-backend.exp b/test/rlhc.d/case/cond10.cpp-C-T0--var-backend.exp
index 5e5e344a..5e5e344a 100644
--- a/test/cases/rlhc.d/case/cond10.cpp-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/cond10.cpp-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond10.cpp-C-T0--var-backend.in b/test/rlhc.d/case/cond10.cpp-C-T0--var-backend.in
index 12ba7f47..12ba7f47 100644
--- a/test/cases/rlhc.d/case/cond10.cpp-C-T0--var-backend.in
+++ b/test/rlhc.d/case/cond10.cpp-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond10.cpp-C-T1--goto-backend.exp b/test/rlhc.d/case/cond10.cpp-C-T1--goto-backend.exp
index aa3d627b..aa3d627b 100644
--- a/test/cases/rlhc.d/case/cond10.cpp-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/cond10.cpp-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond10.cpp-C-T1--goto-backend.in b/test/rlhc.d/case/cond10.cpp-C-T1--goto-backend.in
index e1bf044a..e1bf044a 100644
--- a/test/cases/rlhc.d/case/cond10.cpp-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/cond10.cpp-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond10.cpp-C-T1--var-backend.exp b/test/rlhc.d/case/cond10.cpp-C-T1--var-backend.exp
index 1869425d..1869425d 100644
--- a/test/cases/rlhc.d/case/cond10.cpp-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/cond10.cpp-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond10.cpp-C-T1--var-backend.in b/test/rlhc.d/case/cond10.cpp-C-T1--var-backend.in
index a3464b4b..a3464b4b 100644
--- a/test/cases/rlhc.d/case/cond10.cpp-C-T1--var-backend.in
+++ b/test/rlhc.d/case/cond10.cpp-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_c.c-C-F0--goto-backend.exp b/test/rlhc.d/case/cond1_c.c-C-F0--goto-backend.exp
index 704a73dc..704a73dc 100644
--- a/test/cases/rlhc.d/case/cond1_c.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/cond1_c.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_c.c-C-F0--goto-backend.in b/test/rlhc.d/case/cond1_c.c-C-F0--goto-backend.in
index 44552288..44552288 100644
--- a/test/cases/rlhc.d/case/cond1_c.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/cond1_c.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_c.c-C-F0--var-backend.exp b/test/rlhc.d/case/cond1_c.c-C-F0--var-backend.exp
index de4941d5..de4941d5 100644
--- a/test/cases/rlhc.d/case/cond1_c.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/cond1_c.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_c.c-C-F0--var-backend.in b/test/rlhc.d/case/cond1_c.c-C-F0--var-backend.in
index e11a743c..e11a743c 100644
--- a/test/cases/rlhc.d/case/cond1_c.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/cond1_c.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_c.c-C-F1--goto-backend.exp b/test/rlhc.d/case/cond1_c.c-C-F1--goto-backend.exp
index 28ec3ca7..28ec3ca7 100644
--- a/test/cases/rlhc.d/case/cond1_c.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/cond1_c.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_c.c-C-F1--goto-backend.in b/test/rlhc.d/case/cond1_c.c-C-F1--goto-backend.in
index d8c91a4d..d8c91a4d 100644
--- a/test/cases/rlhc.d/case/cond1_c.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/cond1_c.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_c.c-C-F1--var-backend.exp b/test/rlhc.d/case/cond1_c.c-C-F1--var-backend.exp
index 6749ef00..6749ef00 100644
--- a/test/cases/rlhc.d/case/cond1_c.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/cond1_c.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_c.c-C-F1--var-backend.in b/test/rlhc.d/case/cond1_c.c-C-F1--var-backend.in
index ccaf1530..ccaf1530 100644
--- a/test/cases/rlhc.d/case/cond1_c.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/cond1_c.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_c.c-C-G0--goto-backend.exp b/test/rlhc.d/case/cond1_c.c-C-G0--goto-backend.exp
index eb6b287f..eb6b287f 100644
--- a/test/cases/rlhc.d/case/cond1_c.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/cond1_c.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_c.c-C-G0--goto-backend.in b/test/rlhc.d/case/cond1_c.c-C-G0--goto-backend.in
index cd211baf..cd211baf 100644
--- a/test/cases/rlhc.d/case/cond1_c.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/cond1_c.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_c.c-C-G1--goto-backend.exp b/test/rlhc.d/case/cond1_c.c-C-G1--goto-backend.exp
index 10fbf787..10fbf787 100644
--- a/test/cases/rlhc.d/case/cond1_c.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/cond1_c.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_c.c-C-G1--goto-backend.in b/test/rlhc.d/case/cond1_c.c-C-G1--goto-backend.in
index ee1178dd..ee1178dd 100644
--- a/test/cases/rlhc.d/case/cond1_c.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/cond1_c.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_c.c-C-G2--goto-backend.exp b/test/rlhc.d/case/cond1_c.c-C-G2--goto-backend.exp
index 5f60fdd6..5f60fdd6 100644
--- a/test/cases/rlhc.d/case/cond1_c.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/cond1_c.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_c.c-C-G2--goto-backend.in b/test/rlhc.d/case/cond1_c.c-C-G2--goto-backend.in
index fdc46b24..fdc46b24 100644
--- a/test/cases/rlhc.d/case/cond1_c.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/cond1_c.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_c.c-C-T0--goto-backend.exp b/test/rlhc.d/case/cond1_c.c-C-T0--goto-backend.exp
index b5ee8980..b5ee8980 100644
--- a/test/cases/rlhc.d/case/cond1_c.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/cond1_c.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_c.c-C-T0--goto-backend.in b/test/rlhc.d/case/cond1_c.c-C-T0--goto-backend.in
index b2b50d01..b2b50d01 100644
--- a/test/cases/rlhc.d/case/cond1_c.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/cond1_c.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_c.c-C-T0--var-backend.exp b/test/rlhc.d/case/cond1_c.c-C-T0--var-backend.exp
index f636c4f6..f636c4f6 100644
--- a/test/cases/rlhc.d/case/cond1_c.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/cond1_c.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_c.c-C-T0--var-backend.in b/test/rlhc.d/case/cond1_c.c-C-T0--var-backend.in
index 8c83b61b..8c83b61b 100644
--- a/test/cases/rlhc.d/case/cond1_c.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/cond1_c.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_c.c-C-T1--goto-backend.exp b/test/rlhc.d/case/cond1_c.c-C-T1--goto-backend.exp
index 5800acb7..5800acb7 100644
--- a/test/cases/rlhc.d/case/cond1_c.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/cond1_c.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_c.c-C-T1--goto-backend.in b/test/rlhc.d/case/cond1_c.c-C-T1--goto-backend.in
index 3d09a7f8..3d09a7f8 100644
--- a/test/cases/rlhc.d/case/cond1_c.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/cond1_c.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_c.c-C-T1--var-backend.exp b/test/rlhc.d/case/cond1_c.c-C-T1--var-backend.exp
index a1ae5ec6..a1ae5ec6 100644
--- a/test/cases/rlhc.d/case/cond1_c.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/cond1_c.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_c.c-C-T1--var-backend.in b/test/rlhc.d/case/cond1_c.c-C-T1--var-backend.in
index ee7f4617..ee7f4617 100644
--- a/test/cases/rlhc.d/case/cond1_c.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/cond1_c.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_crack.crk-K-F0--var-backend.exp b/test/rlhc.d/case/cond1_crack.crk-K-F0--var-backend.exp
index be410cdf..be410cdf 100644
--- a/test/cases/rlhc.d/case/cond1_crack.crk-K-F0--var-backend.exp
+++ b/test/rlhc.d/case/cond1_crack.crk-K-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_crack.crk-K-F0--var-backend.in b/test/rlhc.d/case/cond1_crack.crk-K-F0--var-backend.in
index 02a9e370..02a9e370 100644
--- a/test/cases/rlhc.d/case/cond1_crack.crk-K-F0--var-backend.in
+++ b/test/rlhc.d/case/cond1_crack.crk-K-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_crack.crk-K-F1--var-backend.exp b/test/rlhc.d/case/cond1_crack.crk-K-F1--var-backend.exp
index 698e7daf..698e7daf 100644
--- a/test/cases/rlhc.d/case/cond1_crack.crk-K-F1--var-backend.exp
+++ b/test/rlhc.d/case/cond1_crack.crk-K-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_crack.crk-K-F1--var-backend.in b/test/rlhc.d/case/cond1_crack.crk-K-F1--var-backend.in
index 715d94ab..715d94ab 100644
--- a/test/cases/rlhc.d/case/cond1_crack.crk-K-F1--var-backend.in
+++ b/test/rlhc.d/case/cond1_crack.crk-K-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_crack.crk-K-T0--var-backend.exp b/test/rlhc.d/case/cond1_crack.crk-K-T0--var-backend.exp
index fa9fc83f..fa9fc83f 100644
--- a/test/cases/rlhc.d/case/cond1_crack.crk-K-T0--var-backend.exp
+++ b/test/rlhc.d/case/cond1_crack.crk-K-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_crack.crk-K-T0--var-backend.in b/test/rlhc.d/case/cond1_crack.crk-K-T0--var-backend.in
index ee48f480..ee48f480 100644
--- a/test/cases/rlhc.d/case/cond1_crack.crk-K-T0--var-backend.in
+++ b/test/rlhc.d/case/cond1_crack.crk-K-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_crack.crk-K-T1--var-backend.exp b/test/rlhc.d/case/cond1_crack.crk-K-T1--var-backend.exp
index 113683bb..113683bb 100644
--- a/test/cases/rlhc.d/case/cond1_crack.crk-K-T1--var-backend.exp
+++ b/test/rlhc.d/case/cond1_crack.crk-K-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_crack.crk-K-T1--var-backend.in b/test/rlhc.d/case/cond1_crack.crk-K-T1--var-backend.in
index 97964e50..97964e50 100644
--- a/test/cases/rlhc.d/case/cond1_crack.crk-K-T1--var-backend.in
+++ b/test/rlhc.d/case/cond1_crack.crk-K-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_cs.cs-A-F0--goto-backend.exp b/test/rlhc.d/case/cond1_cs.cs-A-F0--goto-backend.exp
index 9f656649..9f656649 100644
--- a/test/cases/rlhc.d/case/cond1_cs.cs-A-F0--goto-backend.exp
+++ b/test/rlhc.d/case/cond1_cs.cs-A-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_cs.cs-A-F0--goto-backend.in b/test/rlhc.d/case/cond1_cs.cs-A-F0--goto-backend.in
index 8f3175c6..8f3175c6 100644
--- a/test/cases/rlhc.d/case/cond1_cs.cs-A-F0--goto-backend.in
+++ b/test/rlhc.d/case/cond1_cs.cs-A-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_cs.cs-A-F0--var-backend.exp b/test/rlhc.d/case/cond1_cs.cs-A-F0--var-backend.exp
index 61786206..61786206 100644
--- a/test/cases/rlhc.d/case/cond1_cs.cs-A-F0--var-backend.exp
+++ b/test/rlhc.d/case/cond1_cs.cs-A-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_cs.cs-A-F0--var-backend.in b/test/rlhc.d/case/cond1_cs.cs-A-F0--var-backend.in
index 2e522bee..2e522bee 100644
--- a/test/cases/rlhc.d/case/cond1_cs.cs-A-F0--var-backend.in
+++ b/test/rlhc.d/case/cond1_cs.cs-A-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_cs.cs-A-F1--goto-backend.exp b/test/rlhc.d/case/cond1_cs.cs-A-F1--goto-backend.exp
index b1b5d3eb..b1b5d3eb 100644
--- a/test/cases/rlhc.d/case/cond1_cs.cs-A-F1--goto-backend.exp
+++ b/test/rlhc.d/case/cond1_cs.cs-A-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_cs.cs-A-F1--goto-backend.in b/test/rlhc.d/case/cond1_cs.cs-A-F1--goto-backend.in
index d358d3b1..d358d3b1 100644
--- a/test/cases/rlhc.d/case/cond1_cs.cs-A-F1--goto-backend.in
+++ b/test/rlhc.d/case/cond1_cs.cs-A-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_cs.cs-A-F1--var-backend.exp b/test/rlhc.d/case/cond1_cs.cs-A-F1--var-backend.exp
index dbc0850f..dbc0850f 100644
--- a/test/cases/rlhc.d/case/cond1_cs.cs-A-F1--var-backend.exp
+++ b/test/rlhc.d/case/cond1_cs.cs-A-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_cs.cs-A-F1--var-backend.in b/test/rlhc.d/case/cond1_cs.cs-A-F1--var-backend.in
index d4aefc71..d4aefc71 100644
--- a/test/cases/rlhc.d/case/cond1_cs.cs-A-F1--var-backend.in
+++ b/test/rlhc.d/case/cond1_cs.cs-A-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_cs.cs-A-G0--goto-backend.exp b/test/rlhc.d/case/cond1_cs.cs-A-G0--goto-backend.exp
index 8ba1fa7a..8ba1fa7a 100644
--- a/test/cases/rlhc.d/case/cond1_cs.cs-A-G0--goto-backend.exp
+++ b/test/rlhc.d/case/cond1_cs.cs-A-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_cs.cs-A-G0--goto-backend.in b/test/rlhc.d/case/cond1_cs.cs-A-G0--goto-backend.in
index 86f79eb6..86f79eb6 100644
--- a/test/cases/rlhc.d/case/cond1_cs.cs-A-G0--goto-backend.in
+++ b/test/rlhc.d/case/cond1_cs.cs-A-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_cs.cs-A-G1--goto-backend.exp b/test/rlhc.d/case/cond1_cs.cs-A-G1--goto-backend.exp
index d4c13ee7..d4c13ee7 100644
--- a/test/cases/rlhc.d/case/cond1_cs.cs-A-G1--goto-backend.exp
+++ b/test/rlhc.d/case/cond1_cs.cs-A-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_cs.cs-A-G1--goto-backend.in b/test/rlhc.d/case/cond1_cs.cs-A-G1--goto-backend.in
index 2264da6e..2264da6e 100644
--- a/test/cases/rlhc.d/case/cond1_cs.cs-A-G1--goto-backend.in
+++ b/test/rlhc.d/case/cond1_cs.cs-A-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_cs.cs-A-T0--goto-backend.exp b/test/rlhc.d/case/cond1_cs.cs-A-T0--goto-backend.exp
index 1893c776..1893c776 100644
--- a/test/cases/rlhc.d/case/cond1_cs.cs-A-T0--goto-backend.exp
+++ b/test/rlhc.d/case/cond1_cs.cs-A-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_cs.cs-A-T0--goto-backend.in b/test/rlhc.d/case/cond1_cs.cs-A-T0--goto-backend.in
index 49b2c19f..49b2c19f 100644
--- a/test/cases/rlhc.d/case/cond1_cs.cs-A-T0--goto-backend.in
+++ b/test/rlhc.d/case/cond1_cs.cs-A-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_cs.cs-A-T0--var-backend.exp b/test/rlhc.d/case/cond1_cs.cs-A-T0--var-backend.exp
index 6425d8a2..6425d8a2 100644
--- a/test/cases/rlhc.d/case/cond1_cs.cs-A-T0--var-backend.exp
+++ b/test/rlhc.d/case/cond1_cs.cs-A-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_cs.cs-A-T0--var-backend.in b/test/rlhc.d/case/cond1_cs.cs-A-T0--var-backend.in
index d948886f..d948886f 100644
--- a/test/cases/rlhc.d/case/cond1_cs.cs-A-T0--var-backend.in
+++ b/test/rlhc.d/case/cond1_cs.cs-A-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_cs.cs-A-T1--goto-backend.exp b/test/rlhc.d/case/cond1_cs.cs-A-T1--goto-backend.exp
index 9180d2f0..9180d2f0 100644
--- a/test/cases/rlhc.d/case/cond1_cs.cs-A-T1--goto-backend.exp
+++ b/test/rlhc.d/case/cond1_cs.cs-A-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_cs.cs-A-T1--goto-backend.in b/test/rlhc.d/case/cond1_cs.cs-A-T1--goto-backend.in
index 6617ec4d..6617ec4d 100644
--- a/test/cases/rlhc.d/case/cond1_cs.cs-A-T1--goto-backend.in
+++ b/test/rlhc.d/case/cond1_cs.cs-A-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_cs.cs-A-T1--var-backend.exp b/test/rlhc.d/case/cond1_cs.cs-A-T1--var-backend.exp
index 2f880713..2f880713 100644
--- a/test/cases/rlhc.d/case/cond1_cs.cs-A-T1--var-backend.exp
+++ b/test/rlhc.d/case/cond1_cs.cs-A-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_cs.cs-A-T1--var-backend.in b/test/rlhc.d/case/cond1_cs.cs-A-T1--var-backend.in
index 9362104b..9362104b 100644
--- a/test/cases/rlhc.d/case/cond1_cs.cs-A-T1--var-backend.in
+++ b/test/rlhc.d/case/cond1_cs.cs-A-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_go.go-Z-F0--goto-backend.exp b/test/rlhc.d/case/cond1_go.go-Z-F0--goto-backend.exp
index d9119387..d9119387 100644
--- a/test/cases/rlhc.d/case/cond1_go.go-Z-F0--goto-backend.exp
+++ b/test/rlhc.d/case/cond1_go.go-Z-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_go.go-Z-F0--goto-backend.in b/test/rlhc.d/case/cond1_go.go-Z-F0--goto-backend.in
index 3642bc58..3642bc58 100644
--- a/test/cases/rlhc.d/case/cond1_go.go-Z-F0--goto-backend.in
+++ b/test/rlhc.d/case/cond1_go.go-Z-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_go.go-Z-F0--var-backend.exp b/test/rlhc.d/case/cond1_go.go-Z-F0--var-backend.exp
index 2f1da8d1..2f1da8d1 100644
--- a/test/cases/rlhc.d/case/cond1_go.go-Z-F0--var-backend.exp
+++ b/test/rlhc.d/case/cond1_go.go-Z-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_go.go-Z-F0--var-backend.in b/test/rlhc.d/case/cond1_go.go-Z-F0--var-backend.in
index ae949b6f..ae949b6f 100644
--- a/test/cases/rlhc.d/case/cond1_go.go-Z-F0--var-backend.in
+++ b/test/rlhc.d/case/cond1_go.go-Z-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_go.go-Z-F1--goto-backend.exp b/test/rlhc.d/case/cond1_go.go-Z-F1--goto-backend.exp
index 378d11a7..378d11a7 100644
--- a/test/cases/rlhc.d/case/cond1_go.go-Z-F1--goto-backend.exp
+++ b/test/rlhc.d/case/cond1_go.go-Z-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_go.go-Z-F1--goto-backend.in b/test/rlhc.d/case/cond1_go.go-Z-F1--goto-backend.in
index eb3ca7a0..eb3ca7a0 100644
--- a/test/cases/rlhc.d/case/cond1_go.go-Z-F1--goto-backend.in
+++ b/test/rlhc.d/case/cond1_go.go-Z-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_go.go-Z-F1--var-backend.exp b/test/rlhc.d/case/cond1_go.go-Z-F1--var-backend.exp
index 67654728..67654728 100644
--- a/test/cases/rlhc.d/case/cond1_go.go-Z-F1--var-backend.exp
+++ b/test/rlhc.d/case/cond1_go.go-Z-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_go.go-Z-F1--var-backend.in b/test/rlhc.d/case/cond1_go.go-Z-F1--var-backend.in
index 7af2a71c..7af2a71c 100644
--- a/test/cases/rlhc.d/case/cond1_go.go-Z-F1--var-backend.in
+++ b/test/rlhc.d/case/cond1_go.go-Z-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_go.go-Z-G0--goto-backend.exp b/test/rlhc.d/case/cond1_go.go-Z-G0--goto-backend.exp
index d7db69c6..d7db69c6 100644
--- a/test/cases/rlhc.d/case/cond1_go.go-Z-G0--goto-backend.exp
+++ b/test/rlhc.d/case/cond1_go.go-Z-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_go.go-Z-G0--goto-backend.in b/test/rlhc.d/case/cond1_go.go-Z-G0--goto-backend.in
index 041ea760..041ea760 100644
--- a/test/cases/rlhc.d/case/cond1_go.go-Z-G0--goto-backend.in
+++ b/test/rlhc.d/case/cond1_go.go-Z-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_go.go-Z-G1--goto-backend.exp b/test/rlhc.d/case/cond1_go.go-Z-G1--goto-backend.exp
index 89f28062..89f28062 100644
--- a/test/cases/rlhc.d/case/cond1_go.go-Z-G1--goto-backend.exp
+++ b/test/rlhc.d/case/cond1_go.go-Z-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_go.go-Z-G1--goto-backend.in b/test/rlhc.d/case/cond1_go.go-Z-G1--goto-backend.in
index b22ad7a8..b22ad7a8 100644
--- a/test/cases/rlhc.d/case/cond1_go.go-Z-G1--goto-backend.in
+++ b/test/rlhc.d/case/cond1_go.go-Z-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_go.go-Z-G2--goto-backend.exp b/test/rlhc.d/case/cond1_go.go-Z-G2--goto-backend.exp
index afe38120..afe38120 100644
--- a/test/cases/rlhc.d/case/cond1_go.go-Z-G2--goto-backend.exp
+++ b/test/rlhc.d/case/cond1_go.go-Z-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_go.go-Z-G2--goto-backend.in b/test/rlhc.d/case/cond1_go.go-Z-G2--goto-backend.in
index c5591f41..c5591f41 100644
--- a/test/cases/rlhc.d/case/cond1_go.go-Z-G2--goto-backend.in
+++ b/test/rlhc.d/case/cond1_go.go-Z-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_go.go-Z-T0--goto-backend.exp b/test/rlhc.d/case/cond1_go.go-Z-T0--goto-backend.exp
index c15ac83b..c15ac83b 100644
--- a/test/cases/rlhc.d/case/cond1_go.go-Z-T0--goto-backend.exp
+++ b/test/rlhc.d/case/cond1_go.go-Z-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_go.go-Z-T0--goto-backend.in b/test/rlhc.d/case/cond1_go.go-Z-T0--goto-backend.in
index 2fce21ae..2fce21ae 100644
--- a/test/cases/rlhc.d/case/cond1_go.go-Z-T0--goto-backend.in
+++ b/test/rlhc.d/case/cond1_go.go-Z-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_go.go-Z-T0--var-backend.exp b/test/rlhc.d/case/cond1_go.go-Z-T0--var-backend.exp
index 4b0e250f..4b0e250f 100644
--- a/test/cases/rlhc.d/case/cond1_go.go-Z-T0--var-backend.exp
+++ b/test/rlhc.d/case/cond1_go.go-Z-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_go.go-Z-T0--var-backend.in b/test/rlhc.d/case/cond1_go.go-Z-T0--var-backend.in
index 884eb16d..884eb16d 100644
--- a/test/cases/rlhc.d/case/cond1_go.go-Z-T0--var-backend.in
+++ b/test/rlhc.d/case/cond1_go.go-Z-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_go.go-Z-T1--goto-backend.exp b/test/rlhc.d/case/cond1_go.go-Z-T1--goto-backend.exp
index 745d0236..745d0236 100644
--- a/test/cases/rlhc.d/case/cond1_go.go-Z-T1--goto-backend.exp
+++ b/test/rlhc.d/case/cond1_go.go-Z-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_go.go-Z-T1--goto-backend.in b/test/rlhc.d/case/cond1_go.go-Z-T1--goto-backend.in
index 938c02fc..938c02fc 100644
--- a/test/cases/rlhc.d/case/cond1_go.go-Z-T1--goto-backend.in
+++ b/test/rlhc.d/case/cond1_go.go-Z-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_go.go-Z-T1--var-backend.exp b/test/rlhc.d/case/cond1_go.go-Z-T1--var-backend.exp
index d77d572b..d77d572b 100644
--- a/test/cases/rlhc.d/case/cond1_go.go-Z-T1--var-backend.exp
+++ b/test/rlhc.d/case/cond1_go.go-Z-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_go.go-Z-T1--var-backend.in b/test/rlhc.d/case/cond1_go.go-Z-T1--var-backend.in
index 5f5f64ee..5f5f64ee 100644
--- a/test/cases/rlhc.d/case/cond1_go.go-Z-T1--var-backend.in
+++ b/test/rlhc.d/case/cond1_go.go-Z-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_java.java-J-F0--goto-backend.exp b/test/rlhc.d/case/cond1_java.java-J-F0--goto-backend.exp
index 2b922cee..2b922cee 100644
--- a/test/cases/rlhc.d/case/cond1_java.java-J-F0--goto-backend.exp
+++ b/test/rlhc.d/case/cond1_java.java-J-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_java.java-J-F0--goto-backend.in b/test/rlhc.d/case/cond1_java.java-J-F0--goto-backend.in
index 6bce77d9..6bce77d9 100644
--- a/test/cases/rlhc.d/case/cond1_java.java-J-F0--goto-backend.in
+++ b/test/rlhc.d/case/cond1_java.java-J-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_java.java-J-F0--var-backend.exp b/test/rlhc.d/case/cond1_java.java-J-F0--var-backend.exp
index 71a51ca0..71a51ca0 100644
--- a/test/cases/rlhc.d/case/cond1_java.java-J-F0--var-backend.exp
+++ b/test/rlhc.d/case/cond1_java.java-J-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_java.java-J-F0--var-backend.in b/test/rlhc.d/case/cond1_java.java-J-F0--var-backend.in
index 453ecd5f..453ecd5f 100644
--- a/test/cases/rlhc.d/case/cond1_java.java-J-F0--var-backend.in
+++ b/test/rlhc.d/case/cond1_java.java-J-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_java.java-J-F1--goto-backend.exp b/test/rlhc.d/case/cond1_java.java-J-F1--goto-backend.exp
index 5faedea3..5faedea3 100644
--- a/test/cases/rlhc.d/case/cond1_java.java-J-F1--goto-backend.exp
+++ b/test/rlhc.d/case/cond1_java.java-J-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_java.java-J-F1--goto-backend.in b/test/rlhc.d/case/cond1_java.java-J-F1--goto-backend.in
index 3b28ceb1..3b28ceb1 100644
--- a/test/cases/rlhc.d/case/cond1_java.java-J-F1--goto-backend.in
+++ b/test/rlhc.d/case/cond1_java.java-J-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_java.java-J-F1--var-backend.exp b/test/rlhc.d/case/cond1_java.java-J-F1--var-backend.exp
index b7548e94..b7548e94 100644
--- a/test/cases/rlhc.d/case/cond1_java.java-J-F1--var-backend.exp
+++ b/test/rlhc.d/case/cond1_java.java-J-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_java.java-J-F1--var-backend.in b/test/rlhc.d/case/cond1_java.java-J-F1--var-backend.in
index 2255245e..2255245e 100644
--- a/test/cases/rlhc.d/case/cond1_java.java-J-F1--var-backend.in
+++ b/test/rlhc.d/case/cond1_java.java-J-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_java.java-J-T0--goto-backend.exp b/test/rlhc.d/case/cond1_java.java-J-T0--goto-backend.exp
index 6ad2c684..6ad2c684 100644
--- a/test/cases/rlhc.d/case/cond1_java.java-J-T0--goto-backend.exp
+++ b/test/rlhc.d/case/cond1_java.java-J-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_java.java-J-T0--goto-backend.in b/test/rlhc.d/case/cond1_java.java-J-T0--goto-backend.in
index f4451978..f4451978 100644
--- a/test/cases/rlhc.d/case/cond1_java.java-J-T0--goto-backend.in
+++ b/test/rlhc.d/case/cond1_java.java-J-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_java.java-J-T0--var-backend.exp b/test/rlhc.d/case/cond1_java.java-J-T0--var-backend.exp
index 0f24351f..0f24351f 100644
--- a/test/cases/rlhc.d/case/cond1_java.java-J-T0--var-backend.exp
+++ b/test/rlhc.d/case/cond1_java.java-J-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_java.java-J-T0--var-backend.in b/test/rlhc.d/case/cond1_java.java-J-T0--var-backend.in
index 11bb77b8..11bb77b8 100644
--- a/test/cases/rlhc.d/case/cond1_java.java-J-T0--var-backend.in
+++ b/test/rlhc.d/case/cond1_java.java-J-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_java.java-J-T1--goto-backend.exp b/test/rlhc.d/case/cond1_java.java-J-T1--goto-backend.exp
index 3b4fe028..3b4fe028 100644
--- a/test/cases/rlhc.d/case/cond1_java.java-J-T1--goto-backend.exp
+++ b/test/rlhc.d/case/cond1_java.java-J-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_java.java-J-T1--goto-backend.in b/test/rlhc.d/case/cond1_java.java-J-T1--goto-backend.in
index 3f9a6d35..3f9a6d35 100644
--- a/test/cases/rlhc.d/case/cond1_java.java-J-T1--goto-backend.in
+++ b/test/rlhc.d/case/cond1_java.java-J-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_java.java-J-T1--var-backend.exp b/test/rlhc.d/case/cond1_java.java-J-T1--var-backend.exp
index b0923265..b0923265 100644
--- a/test/cases/rlhc.d/case/cond1_java.java-J-T1--var-backend.exp
+++ b/test/rlhc.d/case/cond1_java.java-J-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_java.java-J-T1--var-backend.in b/test/rlhc.d/case/cond1_java.java-J-T1--var-backend.in
index 1c735904..1c735904 100644
--- a/test/cases/rlhc.d/case/cond1_java.java-J-T1--var-backend.in
+++ b/test/rlhc.d/case/cond1_java.java-J-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_julia.jl-Y-F0--var-backend.exp b/test/rlhc.d/case/cond1_julia.jl-Y-F0--var-backend.exp
index b6e0ea79..b6e0ea79 100644
--- a/test/cases/rlhc.d/case/cond1_julia.jl-Y-F0--var-backend.exp
+++ b/test/rlhc.d/case/cond1_julia.jl-Y-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_julia.jl-Y-F0--var-backend.in b/test/rlhc.d/case/cond1_julia.jl-Y-F0--var-backend.in
index 5d9fd614..5d9fd614 100644
--- a/test/cases/rlhc.d/case/cond1_julia.jl-Y-F0--var-backend.in
+++ b/test/rlhc.d/case/cond1_julia.jl-Y-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_julia.jl-Y-F1--var-backend.exp b/test/rlhc.d/case/cond1_julia.jl-Y-F1--var-backend.exp
index 14ad6fab..14ad6fab 100644
--- a/test/cases/rlhc.d/case/cond1_julia.jl-Y-F1--var-backend.exp
+++ b/test/rlhc.d/case/cond1_julia.jl-Y-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_julia.jl-Y-F1--var-backend.in b/test/rlhc.d/case/cond1_julia.jl-Y-F1--var-backend.in
index 95aa9013..95aa9013 100644
--- a/test/cases/rlhc.d/case/cond1_julia.jl-Y-F1--var-backend.in
+++ b/test/rlhc.d/case/cond1_julia.jl-Y-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_julia.jl-Y-T0--var-backend.exp b/test/rlhc.d/case/cond1_julia.jl-Y-T0--var-backend.exp
index d8d74c04..d8d74c04 100644
--- a/test/cases/rlhc.d/case/cond1_julia.jl-Y-T0--var-backend.exp
+++ b/test/rlhc.d/case/cond1_julia.jl-Y-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_julia.jl-Y-T0--var-backend.in b/test/rlhc.d/case/cond1_julia.jl-Y-T0--var-backend.in
index 43e377b5..43e377b5 100644
--- a/test/cases/rlhc.d/case/cond1_julia.jl-Y-T0--var-backend.in
+++ b/test/rlhc.d/case/cond1_julia.jl-Y-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_julia.jl-Y-T1--var-backend.exp b/test/rlhc.d/case/cond1_julia.jl-Y-T1--var-backend.exp
index be015365..be015365 100644
--- a/test/cases/rlhc.d/case/cond1_julia.jl-Y-T1--var-backend.exp
+++ b/test/rlhc.d/case/cond1_julia.jl-Y-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_julia.jl-Y-T1--var-backend.in b/test/rlhc.d/case/cond1_julia.jl-Y-T1--var-backend.in
index 2c12edaf..2c12edaf 100644
--- a/test/cases/rlhc.d/case/cond1_julia.jl-Y-T1--var-backend.in
+++ b/test/rlhc.d/case/cond1_julia.jl-Y-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_ocaml.ml-O-F0--var-backend.exp b/test/rlhc.d/case/cond1_ocaml.ml-O-F0--var-backend.exp
index 56e86b47..56e86b47 100644
--- a/test/cases/rlhc.d/case/cond1_ocaml.ml-O-F0--var-backend.exp
+++ b/test/rlhc.d/case/cond1_ocaml.ml-O-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_ocaml.ml-O-F0--var-backend.in b/test/rlhc.d/case/cond1_ocaml.ml-O-F0--var-backend.in
index 07cc6269..07cc6269 100644
--- a/test/cases/rlhc.d/case/cond1_ocaml.ml-O-F0--var-backend.in
+++ b/test/rlhc.d/case/cond1_ocaml.ml-O-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_ocaml.ml-O-F1--var-backend.exp b/test/rlhc.d/case/cond1_ocaml.ml-O-F1--var-backend.exp
index c92de956..c92de956 100644
--- a/test/cases/rlhc.d/case/cond1_ocaml.ml-O-F1--var-backend.exp
+++ b/test/rlhc.d/case/cond1_ocaml.ml-O-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_ocaml.ml-O-F1--var-backend.in b/test/rlhc.d/case/cond1_ocaml.ml-O-F1--var-backend.in
index 590c2173..590c2173 100644
--- a/test/cases/rlhc.d/case/cond1_ocaml.ml-O-F1--var-backend.in
+++ b/test/rlhc.d/case/cond1_ocaml.ml-O-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_ocaml.ml-O-T0--var-backend.exp b/test/rlhc.d/case/cond1_ocaml.ml-O-T0--var-backend.exp
index 5777751f..5777751f 100644
--- a/test/cases/rlhc.d/case/cond1_ocaml.ml-O-T0--var-backend.exp
+++ b/test/rlhc.d/case/cond1_ocaml.ml-O-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_ocaml.ml-O-T0--var-backend.in b/test/rlhc.d/case/cond1_ocaml.ml-O-T0--var-backend.in
index fcbc1ed1..fcbc1ed1 100644
--- a/test/cases/rlhc.d/case/cond1_ocaml.ml-O-T0--var-backend.in
+++ b/test/rlhc.d/case/cond1_ocaml.ml-O-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_ocaml.ml-O-T1--var-backend.exp b/test/rlhc.d/case/cond1_ocaml.ml-O-T1--var-backend.exp
index 71c1ce35..71c1ce35 100644
--- a/test/cases/rlhc.d/case/cond1_ocaml.ml-O-T1--var-backend.exp
+++ b/test/rlhc.d/case/cond1_ocaml.ml-O-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_ocaml.ml-O-T1--var-backend.in b/test/rlhc.d/case/cond1_ocaml.ml-O-T1--var-backend.in
index 1d1af654..1d1af654 100644
--- a/test/cases/rlhc.d/case/cond1_ocaml.ml-O-T1--var-backend.in
+++ b/test/rlhc.d/case/cond1_ocaml.ml-O-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_ruby.rb-R-F0--var-backend.exp b/test/rlhc.d/case/cond1_ruby.rb-R-F0--var-backend.exp
index b203c8f3..b203c8f3 100644
--- a/test/cases/rlhc.d/case/cond1_ruby.rb-R-F0--var-backend.exp
+++ b/test/rlhc.d/case/cond1_ruby.rb-R-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_ruby.rb-R-F0--var-backend.in b/test/rlhc.d/case/cond1_ruby.rb-R-F0--var-backend.in
index 15399774..15399774 100644
--- a/test/cases/rlhc.d/case/cond1_ruby.rb-R-F0--var-backend.in
+++ b/test/rlhc.d/case/cond1_ruby.rb-R-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_ruby.rb-R-F1--var-backend.exp b/test/rlhc.d/case/cond1_ruby.rb-R-F1--var-backend.exp
index 25f9e457..25f9e457 100644
--- a/test/cases/rlhc.d/case/cond1_ruby.rb-R-F1--var-backend.exp
+++ b/test/rlhc.d/case/cond1_ruby.rb-R-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_ruby.rb-R-F1--var-backend.in b/test/rlhc.d/case/cond1_ruby.rb-R-F1--var-backend.in
index af9c6d3b..af9c6d3b 100644
--- a/test/cases/rlhc.d/case/cond1_ruby.rb-R-F1--var-backend.in
+++ b/test/rlhc.d/case/cond1_ruby.rb-R-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_ruby.rb-R-T0--var-backend.exp b/test/rlhc.d/case/cond1_ruby.rb-R-T0--var-backend.exp
index 3bf25569..3bf25569 100644
--- a/test/cases/rlhc.d/case/cond1_ruby.rb-R-T0--var-backend.exp
+++ b/test/rlhc.d/case/cond1_ruby.rb-R-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_ruby.rb-R-T0--var-backend.in b/test/rlhc.d/case/cond1_ruby.rb-R-T0--var-backend.in
index c338f7a2..c338f7a2 100644
--- a/test/cases/rlhc.d/case/cond1_ruby.rb-R-T0--var-backend.in
+++ b/test/rlhc.d/case/cond1_ruby.rb-R-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_ruby.rb-R-T1--var-backend.exp b/test/rlhc.d/case/cond1_ruby.rb-R-T1--var-backend.exp
index 3920fe70..3920fe70 100644
--- a/test/cases/rlhc.d/case/cond1_ruby.rb-R-T1--var-backend.exp
+++ b/test/rlhc.d/case/cond1_ruby.rb-R-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_ruby.rb-R-T1--var-backend.in b/test/rlhc.d/case/cond1_ruby.rb-R-T1--var-backend.in
index 0bacea24..0bacea24 100644
--- a/test/cases/rlhc.d/case/cond1_ruby.rb-R-T1--var-backend.in
+++ b/test/rlhc.d/case/cond1_ruby.rb-R-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_rust.rs-U-F0--var-backend.exp b/test/rlhc.d/case/cond1_rust.rs-U-F0--var-backend.exp
index bb9493b0..bb9493b0 100644
--- a/test/cases/rlhc.d/case/cond1_rust.rs-U-F0--var-backend.exp
+++ b/test/rlhc.d/case/cond1_rust.rs-U-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_rust.rs-U-F0--var-backend.in b/test/rlhc.d/case/cond1_rust.rs-U-F0--var-backend.in
index 7a79160b..7a79160b 100644
--- a/test/cases/rlhc.d/case/cond1_rust.rs-U-F0--var-backend.in
+++ b/test/rlhc.d/case/cond1_rust.rs-U-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_rust.rs-U-F1--var-backend.exp b/test/rlhc.d/case/cond1_rust.rs-U-F1--var-backend.exp
index d42531d6..d42531d6 100644
--- a/test/cases/rlhc.d/case/cond1_rust.rs-U-F1--var-backend.exp
+++ b/test/rlhc.d/case/cond1_rust.rs-U-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_rust.rs-U-F1--var-backend.in b/test/rlhc.d/case/cond1_rust.rs-U-F1--var-backend.in
index f7c718a0..f7c718a0 100644
--- a/test/cases/rlhc.d/case/cond1_rust.rs-U-F1--var-backend.in
+++ b/test/rlhc.d/case/cond1_rust.rs-U-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_rust.rs-U-T0--var-backend.exp b/test/rlhc.d/case/cond1_rust.rs-U-T0--var-backend.exp
index 84b1153f..84b1153f 100644
--- a/test/cases/rlhc.d/case/cond1_rust.rs-U-T0--var-backend.exp
+++ b/test/rlhc.d/case/cond1_rust.rs-U-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_rust.rs-U-T0--var-backend.in b/test/rlhc.d/case/cond1_rust.rs-U-T0--var-backend.in
index 7e9342f1..7e9342f1 100644
--- a/test/cases/rlhc.d/case/cond1_rust.rs-U-T0--var-backend.in
+++ b/test/rlhc.d/case/cond1_rust.rs-U-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond1_rust.rs-U-T1--var-backend.exp b/test/rlhc.d/case/cond1_rust.rs-U-T1--var-backend.exp
index afa4864f..afa4864f 100644
--- a/test/cases/rlhc.d/case/cond1_rust.rs-U-T1--var-backend.exp
+++ b/test/rlhc.d/case/cond1_rust.rs-U-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond1_rust.rs-U-T1--var-backend.in b/test/rlhc.d/case/cond1_rust.rs-U-T1--var-backend.in
index 2d1389c0..2d1389c0 100644
--- a/test/cases/rlhc.d/case/cond1_rust.rs-U-T1--var-backend.in
+++ b/test/rlhc.d/case/cond1_rust.rs-U-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond2.cpp-C-F0--goto-backend.exp b/test/rlhc.d/case/cond2.cpp-C-F0--goto-backend.exp
index 11e21540..11e21540 100644
--- a/test/cases/rlhc.d/case/cond2.cpp-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/cond2.cpp-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond2.cpp-C-F0--goto-backend.in b/test/rlhc.d/case/cond2.cpp-C-F0--goto-backend.in
index 0d58a5b4..0d58a5b4 100644
--- a/test/cases/rlhc.d/case/cond2.cpp-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/cond2.cpp-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond2.cpp-C-F0--var-backend.exp b/test/rlhc.d/case/cond2.cpp-C-F0--var-backend.exp
index 9b750a67..9b750a67 100644
--- a/test/cases/rlhc.d/case/cond2.cpp-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/cond2.cpp-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond2.cpp-C-F0--var-backend.in b/test/rlhc.d/case/cond2.cpp-C-F0--var-backend.in
index 2be78ff3..2be78ff3 100644
--- a/test/cases/rlhc.d/case/cond2.cpp-C-F0--var-backend.in
+++ b/test/rlhc.d/case/cond2.cpp-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond2.cpp-C-F1--goto-backend.exp b/test/rlhc.d/case/cond2.cpp-C-F1--goto-backend.exp
index 17c8191f..17c8191f 100644
--- a/test/cases/rlhc.d/case/cond2.cpp-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/cond2.cpp-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond2.cpp-C-F1--goto-backend.in b/test/rlhc.d/case/cond2.cpp-C-F1--goto-backend.in
index d4da5292..d4da5292 100644
--- a/test/cases/rlhc.d/case/cond2.cpp-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/cond2.cpp-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond2.cpp-C-F1--var-backend.exp b/test/rlhc.d/case/cond2.cpp-C-F1--var-backend.exp
index 90feb819..90feb819 100644
--- a/test/cases/rlhc.d/case/cond2.cpp-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/cond2.cpp-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond2.cpp-C-F1--var-backend.in b/test/rlhc.d/case/cond2.cpp-C-F1--var-backend.in
index c0ade316..c0ade316 100644
--- a/test/cases/rlhc.d/case/cond2.cpp-C-F1--var-backend.in
+++ b/test/rlhc.d/case/cond2.cpp-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond2.cpp-C-G0--goto-backend.exp b/test/rlhc.d/case/cond2.cpp-C-G0--goto-backend.exp
index 07c6b8e1..07c6b8e1 100644
--- a/test/cases/rlhc.d/case/cond2.cpp-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/cond2.cpp-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond2.cpp-C-G0--goto-backend.in b/test/rlhc.d/case/cond2.cpp-C-G0--goto-backend.in
index ac902dd6..ac902dd6 100644
--- a/test/cases/rlhc.d/case/cond2.cpp-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/cond2.cpp-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond2.cpp-C-G1--goto-backend.exp b/test/rlhc.d/case/cond2.cpp-C-G1--goto-backend.exp
index d7d72bd2..d7d72bd2 100644
--- a/test/cases/rlhc.d/case/cond2.cpp-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/cond2.cpp-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond2.cpp-C-G1--goto-backend.in b/test/rlhc.d/case/cond2.cpp-C-G1--goto-backend.in
index 4bd5d39e..4bd5d39e 100644
--- a/test/cases/rlhc.d/case/cond2.cpp-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/cond2.cpp-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond2.cpp-C-G2--goto-backend.exp b/test/rlhc.d/case/cond2.cpp-C-G2--goto-backend.exp
index 854469b3..854469b3 100644
--- a/test/cases/rlhc.d/case/cond2.cpp-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/cond2.cpp-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond2.cpp-C-G2--goto-backend.in b/test/rlhc.d/case/cond2.cpp-C-G2--goto-backend.in
index 193488d1..193488d1 100644
--- a/test/cases/rlhc.d/case/cond2.cpp-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/cond2.cpp-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond2.cpp-C-T0--goto-backend.exp b/test/rlhc.d/case/cond2.cpp-C-T0--goto-backend.exp
index 12c8a2fe..12c8a2fe 100644
--- a/test/cases/rlhc.d/case/cond2.cpp-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/cond2.cpp-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond2.cpp-C-T0--goto-backend.in b/test/rlhc.d/case/cond2.cpp-C-T0--goto-backend.in
index 46e09d51..46e09d51 100644
--- a/test/cases/rlhc.d/case/cond2.cpp-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/cond2.cpp-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond2.cpp-C-T0--var-backend.exp b/test/rlhc.d/case/cond2.cpp-C-T0--var-backend.exp
index 1ea3a479..1ea3a479 100644
--- a/test/cases/rlhc.d/case/cond2.cpp-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/cond2.cpp-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond2.cpp-C-T0--var-backend.in b/test/rlhc.d/case/cond2.cpp-C-T0--var-backend.in
index d5f74b9d..d5f74b9d 100644
--- a/test/cases/rlhc.d/case/cond2.cpp-C-T0--var-backend.in
+++ b/test/rlhc.d/case/cond2.cpp-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond2.cpp-C-T1--goto-backend.exp b/test/rlhc.d/case/cond2.cpp-C-T1--goto-backend.exp
index b67d444e..b67d444e 100644
--- a/test/cases/rlhc.d/case/cond2.cpp-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/cond2.cpp-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond2.cpp-C-T1--goto-backend.in b/test/rlhc.d/case/cond2.cpp-C-T1--goto-backend.in
index 2f6db68c..2f6db68c 100644
--- a/test/cases/rlhc.d/case/cond2.cpp-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/cond2.cpp-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond2.cpp-C-T1--var-backend.exp b/test/rlhc.d/case/cond2.cpp-C-T1--var-backend.exp
index 9524a8d1..9524a8d1 100644
--- a/test/cases/rlhc.d/case/cond2.cpp-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/cond2.cpp-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond2.cpp-C-T1--var-backend.in b/test/rlhc.d/case/cond2.cpp-C-T1--var-backend.in
index cea911ca..cea911ca 100644
--- a/test/cases/rlhc.d/case/cond2.cpp-C-T1--var-backend.in
+++ b/test/rlhc.d/case/cond2.cpp-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond3.cpp-C-F0--goto-backend.exp b/test/rlhc.d/case/cond3.cpp-C-F0--goto-backend.exp
index c288cd85..c288cd85 100644
--- a/test/cases/rlhc.d/case/cond3.cpp-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/cond3.cpp-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond3.cpp-C-F0--goto-backend.in b/test/rlhc.d/case/cond3.cpp-C-F0--goto-backend.in
index 4c59ed64..4c59ed64 100644
--- a/test/cases/rlhc.d/case/cond3.cpp-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/cond3.cpp-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond3.cpp-C-F0--var-backend.exp b/test/rlhc.d/case/cond3.cpp-C-F0--var-backend.exp
index e1991c5e..e1991c5e 100644
--- a/test/cases/rlhc.d/case/cond3.cpp-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/cond3.cpp-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond3.cpp-C-F0--var-backend.in b/test/rlhc.d/case/cond3.cpp-C-F0--var-backend.in
index c9c8914d..c9c8914d 100644
--- a/test/cases/rlhc.d/case/cond3.cpp-C-F0--var-backend.in
+++ b/test/rlhc.d/case/cond3.cpp-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond3.cpp-C-F1--goto-backend.exp b/test/rlhc.d/case/cond3.cpp-C-F1--goto-backend.exp
index 2ec83587..2ec83587 100644
--- a/test/cases/rlhc.d/case/cond3.cpp-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/cond3.cpp-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond3.cpp-C-F1--goto-backend.in b/test/rlhc.d/case/cond3.cpp-C-F1--goto-backend.in
index 18022f45..18022f45 100644
--- a/test/cases/rlhc.d/case/cond3.cpp-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/cond3.cpp-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond3.cpp-C-F1--var-backend.exp b/test/rlhc.d/case/cond3.cpp-C-F1--var-backend.exp
index 0e016bcc..0e016bcc 100644
--- a/test/cases/rlhc.d/case/cond3.cpp-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/cond3.cpp-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond3.cpp-C-F1--var-backend.in b/test/rlhc.d/case/cond3.cpp-C-F1--var-backend.in
index aa8691ee..aa8691ee 100644
--- a/test/cases/rlhc.d/case/cond3.cpp-C-F1--var-backend.in
+++ b/test/rlhc.d/case/cond3.cpp-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond3.cpp-C-G0--goto-backend.exp b/test/rlhc.d/case/cond3.cpp-C-G0--goto-backend.exp
index 61416dbf..61416dbf 100644
--- a/test/cases/rlhc.d/case/cond3.cpp-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/cond3.cpp-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond3.cpp-C-G0--goto-backend.in b/test/rlhc.d/case/cond3.cpp-C-G0--goto-backend.in
index 39549d5c..39549d5c 100644
--- a/test/cases/rlhc.d/case/cond3.cpp-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/cond3.cpp-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond3.cpp-C-G1--goto-backend.exp b/test/rlhc.d/case/cond3.cpp-C-G1--goto-backend.exp
index 01bb8b2a..01bb8b2a 100644
--- a/test/cases/rlhc.d/case/cond3.cpp-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/cond3.cpp-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond3.cpp-C-G1--goto-backend.in b/test/rlhc.d/case/cond3.cpp-C-G1--goto-backend.in
index 14241813..14241813 100644
--- a/test/cases/rlhc.d/case/cond3.cpp-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/cond3.cpp-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond3.cpp-C-G2--goto-backend.exp b/test/rlhc.d/case/cond3.cpp-C-G2--goto-backend.exp
index ab0734cf..ab0734cf 100644
--- a/test/cases/rlhc.d/case/cond3.cpp-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/cond3.cpp-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond3.cpp-C-G2--goto-backend.in b/test/rlhc.d/case/cond3.cpp-C-G2--goto-backend.in
index 8fe5ebd6..8fe5ebd6 100644
--- a/test/cases/rlhc.d/case/cond3.cpp-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/cond3.cpp-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond3.cpp-C-T0--goto-backend.exp b/test/rlhc.d/case/cond3.cpp-C-T0--goto-backend.exp
index 60d5423b..60d5423b 100644
--- a/test/cases/rlhc.d/case/cond3.cpp-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/cond3.cpp-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond3.cpp-C-T0--goto-backend.in b/test/rlhc.d/case/cond3.cpp-C-T0--goto-backend.in
index 1f0cf3af..1f0cf3af 100644
--- a/test/cases/rlhc.d/case/cond3.cpp-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/cond3.cpp-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond3.cpp-C-T0--var-backend.exp b/test/rlhc.d/case/cond3.cpp-C-T0--var-backend.exp
index 03af6093..03af6093 100644
--- a/test/cases/rlhc.d/case/cond3.cpp-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/cond3.cpp-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond3.cpp-C-T0--var-backend.in b/test/rlhc.d/case/cond3.cpp-C-T0--var-backend.in
index 6cd7efad..6cd7efad 100644
--- a/test/cases/rlhc.d/case/cond3.cpp-C-T0--var-backend.in
+++ b/test/rlhc.d/case/cond3.cpp-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond3.cpp-C-T1--goto-backend.exp b/test/rlhc.d/case/cond3.cpp-C-T1--goto-backend.exp
index 1c9743d0..1c9743d0 100644
--- a/test/cases/rlhc.d/case/cond3.cpp-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/cond3.cpp-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond3.cpp-C-T1--goto-backend.in b/test/rlhc.d/case/cond3.cpp-C-T1--goto-backend.in
index 147a9936..147a9936 100644
--- a/test/cases/rlhc.d/case/cond3.cpp-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/cond3.cpp-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond3.cpp-C-T1--var-backend.exp b/test/rlhc.d/case/cond3.cpp-C-T1--var-backend.exp
index 3bf08a20..3bf08a20 100644
--- a/test/cases/rlhc.d/case/cond3.cpp-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/cond3.cpp-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond3.cpp-C-T1--var-backend.in b/test/rlhc.d/case/cond3.cpp-C-T1--var-backend.in
index 1b27c641..1b27c641 100644
--- a/test/cases/rlhc.d/case/cond3.cpp-C-T1--var-backend.in
+++ b/test/rlhc.d/case/cond3.cpp-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond4.cpp-C-F0--goto-backend.exp b/test/rlhc.d/case/cond4.cpp-C-F0--goto-backend.exp
index 336adba0..336adba0 100644
--- a/test/cases/rlhc.d/case/cond4.cpp-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/cond4.cpp-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond4.cpp-C-F0--goto-backend.in b/test/rlhc.d/case/cond4.cpp-C-F0--goto-backend.in
index 2f68504b..2f68504b 100644
--- a/test/cases/rlhc.d/case/cond4.cpp-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/cond4.cpp-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond4.cpp-C-F0--var-backend.exp b/test/rlhc.d/case/cond4.cpp-C-F0--var-backend.exp
index a1fe37f2..a1fe37f2 100644
--- a/test/cases/rlhc.d/case/cond4.cpp-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/cond4.cpp-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond4.cpp-C-F0--var-backend.in b/test/rlhc.d/case/cond4.cpp-C-F0--var-backend.in
index 601e0c33..601e0c33 100644
--- a/test/cases/rlhc.d/case/cond4.cpp-C-F0--var-backend.in
+++ b/test/rlhc.d/case/cond4.cpp-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond4.cpp-C-F1--goto-backend.exp b/test/rlhc.d/case/cond4.cpp-C-F1--goto-backend.exp
index 74f701b0..74f701b0 100644
--- a/test/cases/rlhc.d/case/cond4.cpp-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/cond4.cpp-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond4.cpp-C-F1--goto-backend.in b/test/rlhc.d/case/cond4.cpp-C-F1--goto-backend.in
index 19fbe4e8..19fbe4e8 100644
--- a/test/cases/rlhc.d/case/cond4.cpp-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/cond4.cpp-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond4.cpp-C-F1--var-backend.exp b/test/rlhc.d/case/cond4.cpp-C-F1--var-backend.exp
index a012e386..a012e386 100644
--- a/test/cases/rlhc.d/case/cond4.cpp-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/cond4.cpp-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond4.cpp-C-F1--var-backend.in b/test/rlhc.d/case/cond4.cpp-C-F1--var-backend.in
index 66de8553..66de8553 100644
--- a/test/cases/rlhc.d/case/cond4.cpp-C-F1--var-backend.in
+++ b/test/rlhc.d/case/cond4.cpp-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond4.cpp-C-G0--goto-backend.exp b/test/rlhc.d/case/cond4.cpp-C-G0--goto-backend.exp
index 04410ffa..04410ffa 100644
--- a/test/cases/rlhc.d/case/cond4.cpp-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/cond4.cpp-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond4.cpp-C-G0--goto-backend.in b/test/rlhc.d/case/cond4.cpp-C-G0--goto-backend.in
index 2a28520e..2a28520e 100644
--- a/test/cases/rlhc.d/case/cond4.cpp-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/cond4.cpp-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond4.cpp-C-G1--goto-backend.exp b/test/rlhc.d/case/cond4.cpp-C-G1--goto-backend.exp
index 32b4afbd..32b4afbd 100644
--- a/test/cases/rlhc.d/case/cond4.cpp-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/cond4.cpp-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond4.cpp-C-G1--goto-backend.in b/test/rlhc.d/case/cond4.cpp-C-G1--goto-backend.in
index 4a10141d..4a10141d 100644
--- a/test/cases/rlhc.d/case/cond4.cpp-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/cond4.cpp-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond4.cpp-C-G2--goto-backend.exp b/test/rlhc.d/case/cond4.cpp-C-G2--goto-backend.exp
index dbc325e2..dbc325e2 100644
--- a/test/cases/rlhc.d/case/cond4.cpp-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/cond4.cpp-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond4.cpp-C-G2--goto-backend.in b/test/rlhc.d/case/cond4.cpp-C-G2--goto-backend.in
index c9696c50..c9696c50 100644
--- a/test/cases/rlhc.d/case/cond4.cpp-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/cond4.cpp-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond4.cpp-C-T0--goto-backend.exp b/test/rlhc.d/case/cond4.cpp-C-T0--goto-backend.exp
index 349ba7b7..349ba7b7 100644
--- a/test/cases/rlhc.d/case/cond4.cpp-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/cond4.cpp-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond4.cpp-C-T0--goto-backend.in b/test/rlhc.d/case/cond4.cpp-C-T0--goto-backend.in
index c0f1a2f0..c0f1a2f0 100644
--- a/test/cases/rlhc.d/case/cond4.cpp-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/cond4.cpp-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond4.cpp-C-T0--var-backend.exp b/test/rlhc.d/case/cond4.cpp-C-T0--var-backend.exp
index dc761b64..dc761b64 100644
--- a/test/cases/rlhc.d/case/cond4.cpp-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/cond4.cpp-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond4.cpp-C-T0--var-backend.in b/test/rlhc.d/case/cond4.cpp-C-T0--var-backend.in
index 6ad1a554..6ad1a554 100644
--- a/test/cases/rlhc.d/case/cond4.cpp-C-T0--var-backend.in
+++ b/test/rlhc.d/case/cond4.cpp-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond4.cpp-C-T1--goto-backend.exp b/test/rlhc.d/case/cond4.cpp-C-T1--goto-backend.exp
index b25eb338..b25eb338 100644
--- a/test/cases/rlhc.d/case/cond4.cpp-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/cond4.cpp-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond4.cpp-C-T1--goto-backend.in b/test/rlhc.d/case/cond4.cpp-C-T1--goto-backend.in
index 721b3f48..721b3f48 100644
--- a/test/cases/rlhc.d/case/cond4.cpp-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/cond4.cpp-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond4.cpp-C-T1--var-backend.exp b/test/rlhc.d/case/cond4.cpp-C-T1--var-backend.exp
index 59bd9a5f..59bd9a5f 100644
--- a/test/cases/rlhc.d/case/cond4.cpp-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/cond4.cpp-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond4.cpp-C-T1--var-backend.in b/test/rlhc.d/case/cond4.cpp-C-T1--var-backend.in
index 32983d3d..32983d3d 100644
--- a/test/cases/rlhc.d/case/cond4.cpp-C-T1--var-backend.in
+++ b/test/rlhc.d/case/cond4.cpp-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond5.cpp-C-F0--goto-backend.exp b/test/rlhc.d/case/cond5.cpp-C-F0--goto-backend.exp
index 258c686b..258c686b 100644
--- a/test/cases/rlhc.d/case/cond5.cpp-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/cond5.cpp-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond5.cpp-C-F0--goto-backend.in b/test/rlhc.d/case/cond5.cpp-C-F0--goto-backend.in
index 91521864..91521864 100644
--- a/test/cases/rlhc.d/case/cond5.cpp-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/cond5.cpp-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond5.cpp-C-F0--var-backend.exp b/test/rlhc.d/case/cond5.cpp-C-F0--var-backend.exp
index e2190aba..e2190aba 100644
--- a/test/cases/rlhc.d/case/cond5.cpp-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/cond5.cpp-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond5.cpp-C-F0--var-backend.in b/test/rlhc.d/case/cond5.cpp-C-F0--var-backend.in
index 27378a1c..27378a1c 100644
--- a/test/cases/rlhc.d/case/cond5.cpp-C-F0--var-backend.in
+++ b/test/rlhc.d/case/cond5.cpp-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond5.cpp-C-F1--goto-backend.exp b/test/rlhc.d/case/cond5.cpp-C-F1--goto-backend.exp
index 890c2117..890c2117 100644
--- a/test/cases/rlhc.d/case/cond5.cpp-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/cond5.cpp-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond5.cpp-C-F1--goto-backend.in b/test/rlhc.d/case/cond5.cpp-C-F1--goto-backend.in
index 582f09b0..582f09b0 100644
--- a/test/cases/rlhc.d/case/cond5.cpp-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/cond5.cpp-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond5.cpp-C-F1--var-backend.exp b/test/rlhc.d/case/cond5.cpp-C-F1--var-backend.exp
index c41e78b4..c41e78b4 100644
--- a/test/cases/rlhc.d/case/cond5.cpp-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/cond5.cpp-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond5.cpp-C-F1--var-backend.in b/test/rlhc.d/case/cond5.cpp-C-F1--var-backend.in
index 5a558e08..5a558e08 100644
--- a/test/cases/rlhc.d/case/cond5.cpp-C-F1--var-backend.in
+++ b/test/rlhc.d/case/cond5.cpp-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond5.cpp-C-G0--goto-backend.exp b/test/rlhc.d/case/cond5.cpp-C-G0--goto-backend.exp
index 44c06ed9..44c06ed9 100644
--- a/test/cases/rlhc.d/case/cond5.cpp-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/cond5.cpp-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond5.cpp-C-G0--goto-backend.in b/test/rlhc.d/case/cond5.cpp-C-G0--goto-backend.in
index f1d4085c..f1d4085c 100644
--- a/test/cases/rlhc.d/case/cond5.cpp-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/cond5.cpp-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond5.cpp-C-G1--goto-backend.exp b/test/rlhc.d/case/cond5.cpp-C-G1--goto-backend.exp
index eb8b05dc..eb8b05dc 100644
--- a/test/cases/rlhc.d/case/cond5.cpp-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/cond5.cpp-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond5.cpp-C-G1--goto-backend.in b/test/rlhc.d/case/cond5.cpp-C-G1--goto-backend.in
index 188258dd..188258dd 100644
--- a/test/cases/rlhc.d/case/cond5.cpp-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/cond5.cpp-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond5.cpp-C-G2--goto-backend.exp b/test/rlhc.d/case/cond5.cpp-C-G2--goto-backend.exp
index 80d59f42..80d59f42 100644
--- a/test/cases/rlhc.d/case/cond5.cpp-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/cond5.cpp-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond5.cpp-C-G2--goto-backend.in b/test/rlhc.d/case/cond5.cpp-C-G2--goto-backend.in
index 6096a39f..6096a39f 100644
--- a/test/cases/rlhc.d/case/cond5.cpp-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/cond5.cpp-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond5.cpp-C-T0--goto-backend.exp b/test/rlhc.d/case/cond5.cpp-C-T0--goto-backend.exp
index 26ae18f3..26ae18f3 100644
--- a/test/cases/rlhc.d/case/cond5.cpp-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/cond5.cpp-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond5.cpp-C-T0--goto-backend.in b/test/rlhc.d/case/cond5.cpp-C-T0--goto-backend.in
index fa9c900d..fa9c900d 100644
--- a/test/cases/rlhc.d/case/cond5.cpp-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/cond5.cpp-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond5.cpp-C-T0--var-backend.exp b/test/rlhc.d/case/cond5.cpp-C-T0--var-backend.exp
index dec009dc..dec009dc 100644
--- a/test/cases/rlhc.d/case/cond5.cpp-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/cond5.cpp-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond5.cpp-C-T0--var-backend.in b/test/rlhc.d/case/cond5.cpp-C-T0--var-backend.in
index 283cfd10..283cfd10 100644
--- a/test/cases/rlhc.d/case/cond5.cpp-C-T0--var-backend.in
+++ b/test/rlhc.d/case/cond5.cpp-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond5.cpp-C-T1--goto-backend.exp b/test/rlhc.d/case/cond5.cpp-C-T1--goto-backend.exp
index a45f5e6b..a45f5e6b 100644
--- a/test/cases/rlhc.d/case/cond5.cpp-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/cond5.cpp-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond5.cpp-C-T1--goto-backend.in b/test/rlhc.d/case/cond5.cpp-C-T1--goto-backend.in
index 01a65457..01a65457 100644
--- a/test/cases/rlhc.d/case/cond5.cpp-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/cond5.cpp-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond5.cpp-C-T1--var-backend.exp b/test/rlhc.d/case/cond5.cpp-C-T1--var-backend.exp
index c94287bc..c94287bc 100644
--- a/test/cases/rlhc.d/case/cond5.cpp-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/cond5.cpp-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond5.cpp-C-T1--var-backend.in b/test/rlhc.d/case/cond5.cpp-C-T1--var-backend.in
index 036db5d9..036db5d9 100644
--- a/test/cases/rlhc.d/case/cond5.cpp-C-T1--var-backend.in
+++ b/test/rlhc.d/case/cond5.cpp-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond6.cpp-C-F0--goto-backend.exp b/test/rlhc.d/case/cond6.cpp-C-F0--goto-backend.exp
index 9f06109f..9f06109f 100644
--- a/test/cases/rlhc.d/case/cond6.cpp-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/cond6.cpp-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond6.cpp-C-F0--goto-backend.in b/test/rlhc.d/case/cond6.cpp-C-F0--goto-backend.in
index c8a20abb..c8a20abb 100644
--- a/test/cases/rlhc.d/case/cond6.cpp-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/cond6.cpp-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond6.cpp-C-F0--var-backend.exp b/test/rlhc.d/case/cond6.cpp-C-F0--var-backend.exp
index cd7c6ed9..cd7c6ed9 100644
--- a/test/cases/rlhc.d/case/cond6.cpp-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/cond6.cpp-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond6.cpp-C-F0--var-backend.in b/test/rlhc.d/case/cond6.cpp-C-F0--var-backend.in
index 3701fd51..3701fd51 100644
--- a/test/cases/rlhc.d/case/cond6.cpp-C-F0--var-backend.in
+++ b/test/rlhc.d/case/cond6.cpp-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond6.cpp-C-F1--goto-backend.exp b/test/rlhc.d/case/cond6.cpp-C-F1--goto-backend.exp
index 86786512..86786512 100644
--- a/test/cases/rlhc.d/case/cond6.cpp-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/cond6.cpp-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond6.cpp-C-F1--goto-backend.in b/test/rlhc.d/case/cond6.cpp-C-F1--goto-backend.in
index cdc80572..cdc80572 100644
--- a/test/cases/rlhc.d/case/cond6.cpp-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/cond6.cpp-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond6.cpp-C-F1--var-backend.exp b/test/rlhc.d/case/cond6.cpp-C-F1--var-backend.exp
index ddb19aab..ddb19aab 100644
--- a/test/cases/rlhc.d/case/cond6.cpp-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/cond6.cpp-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond6.cpp-C-F1--var-backend.in b/test/rlhc.d/case/cond6.cpp-C-F1--var-backend.in
index d9dcc4e2..d9dcc4e2 100644
--- a/test/cases/rlhc.d/case/cond6.cpp-C-F1--var-backend.in
+++ b/test/rlhc.d/case/cond6.cpp-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond6.cpp-C-G0--goto-backend.exp b/test/rlhc.d/case/cond6.cpp-C-G0--goto-backend.exp
index 0e64138e..0e64138e 100644
--- a/test/cases/rlhc.d/case/cond6.cpp-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/cond6.cpp-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond6.cpp-C-G0--goto-backend.in b/test/rlhc.d/case/cond6.cpp-C-G0--goto-backend.in
index 09782496..09782496 100644
--- a/test/cases/rlhc.d/case/cond6.cpp-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/cond6.cpp-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond6.cpp-C-G1--goto-backend.exp b/test/rlhc.d/case/cond6.cpp-C-G1--goto-backend.exp
index 1d970682..1d970682 100644
--- a/test/cases/rlhc.d/case/cond6.cpp-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/cond6.cpp-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond6.cpp-C-G1--goto-backend.in b/test/rlhc.d/case/cond6.cpp-C-G1--goto-backend.in
index 60666288..60666288 100644
--- a/test/cases/rlhc.d/case/cond6.cpp-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/cond6.cpp-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond6.cpp-C-G2--goto-backend.exp b/test/rlhc.d/case/cond6.cpp-C-G2--goto-backend.exp
index 1e44f470..1e44f470 100644
--- a/test/cases/rlhc.d/case/cond6.cpp-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/cond6.cpp-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond6.cpp-C-G2--goto-backend.in b/test/rlhc.d/case/cond6.cpp-C-G2--goto-backend.in
index 7bc789f1..7bc789f1 100644
--- a/test/cases/rlhc.d/case/cond6.cpp-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/cond6.cpp-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond6.cpp-C-T0--goto-backend.exp b/test/rlhc.d/case/cond6.cpp-C-T0--goto-backend.exp
index 27ac5e5d..27ac5e5d 100644
--- a/test/cases/rlhc.d/case/cond6.cpp-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/cond6.cpp-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond6.cpp-C-T0--goto-backend.in b/test/rlhc.d/case/cond6.cpp-C-T0--goto-backend.in
index 1636e5dd..1636e5dd 100644
--- a/test/cases/rlhc.d/case/cond6.cpp-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/cond6.cpp-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond6.cpp-C-T0--var-backend.exp b/test/rlhc.d/case/cond6.cpp-C-T0--var-backend.exp
index 3e5a37e5..3e5a37e5 100644
--- a/test/cases/rlhc.d/case/cond6.cpp-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/cond6.cpp-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond6.cpp-C-T0--var-backend.in b/test/rlhc.d/case/cond6.cpp-C-T0--var-backend.in
index 4d8b3340..4d8b3340 100644
--- a/test/cases/rlhc.d/case/cond6.cpp-C-T0--var-backend.in
+++ b/test/rlhc.d/case/cond6.cpp-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond6.cpp-C-T1--goto-backend.exp b/test/rlhc.d/case/cond6.cpp-C-T1--goto-backend.exp
index d08c43a2..d08c43a2 100644
--- a/test/cases/rlhc.d/case/cond6.cpp-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/cond6.cpp-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond6.cpp-C-T1--goto-backend.in b/test/rlhc.d/case/cond6.cpp-C-T1--goto-backend.in
index dc2d56ea..dc2d56ea 100644
--- a/test/cases/rlhc.d/case/cond6.cpp-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/cond6.cpp-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond6.cpp-C-T1--var-backend.exp b/test/rlhc.d/case/cond6.cpp-C-T1--var-backend.exp
index 0efafc30..0efafc30 100644
--- a/test/cases/rlhc.d/case/cond6.cpp-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/cond6.cpp-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond6.cpp-C-T1--var-backend.in b/test/rlhc.d/case/cond6.cpp-C-T1--var-backend.in
index 3289198f..3289198f 100644
--- a/test/cases/rlhc.d/case/cond6.cpp-C-T1--var-backend.in
+++ b/test/rlhc.d/case/cond6.cpp-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_c.c-C-F0--goto-backend.exp b/test/rlhc.d/case/cond7_c.c-C-F0--goto-backend.exp
index 70b1d483..70b1d483 100644
--- a/test/cases/rlhc.d/case/cond7_c.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/cond7_c.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_c.c-C-F0--goto-backend.in b/test/rlhc.d/case/cond7_c.c-C-F0--goto-backend.in
index 7321a25a..7321a25a 100644
--- a/test/cases/rlhc.d/case/cond7_c.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/cond7_c.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_c.c-C-F0--var-backend.exp b/test/rlhc.d/case/cond7_c.c-C-F0--var-backend.exp
index 6ab153a3..6ab153a3 100644
--- a/test/cases/rlhc.d/case/cond7_c.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/cond7_c.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_c.c-C-F0--var-backend.in b/test/rlhc.d/case/cond7_c.c-C-F0--var-backend.in
index bac68c99..bac68c99 100644
--- a/test/cases/rlhc.d/case/cond7_c.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/cond7_c.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_c.c-C-F1--goto-backend.exp b/test/rlhc.d/case/cond7_c.c-C-F1--goto-backend.exp
index 9dcb66ad..9dcb66ad 100644
--- a/test/cases/rlhc.d/case/cond7_c.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/cond7_c.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_c.c-C-F1--goto-backend.in b/test/rlhc.d/case/cond7_c.c-C-F1--goto-backend.in
index 48d6adc8..48d6adc8 100644
--- a/test/cases/rlhc.d/case/cond7_c.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/cond7_c.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_c.c-C-F1--var-backend.exp b/test/rlhc.d/case/cond7_c.c-C-F1--var-backend.exp
index e4db2108..e4db2108 100644
--- a/test/cases/rlhc.d/case/cond7_c.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/cond7_c.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_c.c-C-F1--var-backend.in b/test/rlhc.d/case/cond7_c.c-C-F1--var-backend.in
index 2ab22b2f..2ab22b2f 100644
--- a/test/cases/rlhc.d/case/cond7_c.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/cond7_c.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_c.c-C-G0--goto-backend.exp b/test/rlhc.d/case/cond7_c.c-C-G0--goto-backend.exp
index 4f32ffeb..4f32ffeb 100644
--- a/test/cases/rlhc.d/case/cond7_c.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/cond7_c.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_c.c-C-G0--goto-backend.in b/test/rlhc.d/case/cond7_c.c-C-G0--goto-backend.in
index 91567b8b..91567b8b 100644
--- a/test/cases/rlhc.d/case/cond7_c.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/cond7_c.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_c.c-C-G1--goto-backend.exp b/test/rlhc.d/case/cond7_c.c-C-G1--goto-backend.exp
index 01422dee..01422dee 100644
--- a/test/cases/rlhc.d/case/cond7_c.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/cond7_c.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_c.c-C-G1--goto-backend.in b/test/rlhc.d/case/cond7_c.c-C-G1--goto-backend.in
index ec4b6711..ec4b6711 100644
--- a/test/cases/rlhc.d/case/cond7_c.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/cond7_c.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_c.c-C-G2--goto-backend.exp b/test/rlhc.d/case/cond7_c.c-C-G2--goto-backend.exp
index 0606dff4..0606dff4 100644
--- a/test/cases/rlhc.d/case/cond7_c.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/cond7_c.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_c.c-C-G2--goto-backend.in b/test/rlhc.d/case/cond7_c.c-C-G2--goto-backend.in
index d5ac6a20..d5ac6a20 100644
--- a/test/cases/rlhc.d/case/cond7_c.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/cond7_c.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_c.c-C-T0--goto-backend.exp b/test/rlhc.d/case/cond7_c.c-C-T0--goto-backend.exp
index 1c7d2b8d..1c7d2b8d 100644
--- a/test/cases/rlhc.d/case/cond7_c.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/cond7_c.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_c.c-C-T0--goto-backend.in b/test/rlhc.d/case/cond7_c.c-C-T0--goto-backend.in
index bf9dc52f..bf9dc52f 100644
--- a/test/cases/rlhc.d/case/cond7_c.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/cond7_c.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_c.c-C-T0--var-backend.exp b/test/rlhc.d/case/cond7_c.c-C-T0--var-backend.exp
index 559367ee..559367ee 100644
--- a/test/cases/rlhc.d/case/cond7_c.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/cond7_c.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_c.c-C-T0--var-backend.in b/test/rlhc.d/case/cond7_c.c-C-T0--var-backend.in
index f86bd874..f86bd874 100644
--- a/test/cases/rlhc.d/case/cond7_c.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/cond7_c.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_c.c-C-T1--goto-backend.exp b/test/rlhc.d/case/cond7_c.c-C-T1--goto-backend.exp
index f4c69937..f4c69937 100644
--- a/test/cases/rlhc.d/case/cond7_c.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/cond7_c.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_c.c-C-T1--goto-backend.in b/test/rlhc.d/case/cond7_c.c-C-T1--goto-backend.in
index 8d16e23a..8d16e23a 100644
--- a/test/cases/rlhc.d/case/cond7_c.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/cond7_c.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_c.c-C-T1--var-backend.exp b/test/rlhc.d/case/cond7_c.c-C-T1--var-backend.exp
index a144c662..a144c662 100644
--- a/test/cases/rlhc.d/case/cond7_c.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/cond7_c.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_c.c-C-T1--var-backend.in b/test/rlhc.d/case/cond7_c.c-C-T1--var-backend.in
index 7a9780b3..7a9780b3 100644
--- a/test/cases/rlhc.d/case/cond7_c.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/cond7_c.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_crack.crk-K-F0--var-backend.exp b/test/rlhc.d/case/cond7_crack.crk-K-F0--var-backend.exp
index d4046b79..d4046b79 100644
--- a/test/cases/rlhc.d/case/cond7_crack.crk-K-F0--var-backend.exp
+++ b/test/rlhc.d/case/cond7_crack.crk-K-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_crack.crk-K-F0--var-backend.in b/test/rlhc.d/case/cond7_crack.crk-K-F0--var-backend.in
index 592b2775..592b2775 100644
--- a/test/cases/rlhc.d/case/cond7_crack.crk-K-F0--var-backend.in
+++ b/test/rlhc.d/case/cond7_crack.crk-K-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_crack.crk-K-F1--var-backend.exp b/test/rlhc.d/case/cond7_crack.crk-K-F1--var-backend.exp
index bd3f15dc..bd3f15dc 100644
--- a/test/cases/rlhc.d/case/cond7_crack.crk-K-F1--var-backend.exp
+++ b/test/rlhc.d/case/cond7_crack.crk-K-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_crack.crk-K-F1--var-backend.in b/test/rlhc.d/case/cond7_crack.crk-K-F1--var-backend.in
index 96c2e68d..96c2e68d 100644
--- a/test/cases/rlhc.d/case/cond7_crack.crk-K-F1--var-backend.in
+++ b/test/rlhc.d/case/cond7_crack.crk-K-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_crack.crk-K-T0--var-backend.exp b/test/rlhc.d/case/cond7_crack.crk-K-T0--var-backend.exp
index 12e113c3..12e113c3 100644
--- a/test/cases/rlhc.d/case/cond7_crack.crk-K-T0--var-backend.exp
+++ b/test/rlhc.d/case/cond7_crack.crk-K-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_crack.crk-K-T0--var-backend.in b/test/rlhc.d/case/cond7_crack.crk-K-T0--var-backend.in
index f8aad35f..f8aad35f 100644
--- a/test/cases/rlhc.d/case/cond7_crack.crk-K-T0--var-backend.in
+++ b/test/rlhc.d/case/cond7_crack.crk-K-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_crack.crk-K-T1--var-backend.exp b/test/rlhc.d/case/cond7_crack.crk-K-T1--var-backend.exp
index 60c04971..60c04971 100644
--- a/test/cases/rlhc.d/case/cond7_crack.crk-K-T1--var-backend.exp
+++ b/test/rlhc.d/case/cond7_crack.crk-K-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_crack.crk-K-T1--var-backend.in b/test/rlhc.d/case/cond7_crack.crk-K-T1--var-backend.in
index 7eeb60c0..7eeb60c0 100644
--- a/test/cases/rlhc.d/case/cond7_crack.crk-K-T1--var-backend.in
+++ b/test/rlhc.d/case/cond7_crack.crk-K-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_cs.cs-A-F0--goto-backend.exp b/test/rlhc.d/case/cond7_cs.cs-A-F0--goto-backend.exp
index ae20033d..ae20033d 100644
--- a/test/cases/rlhc.d/case/cond7_cs.cs-A-F0--goto-backend.exp
+++ b/test/rlhc.d/case/cond7_cs.cs-A-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_cs.cs-A-F0--goto-backend.in b/test/rlhc.d/case/cond7_cs.cs-A-F0--goto-backend.in
index cda354bc..cda354bc 100644
--- a/test/cases/rlhc.d/case/cond7_cs.cs-A-F0--goto-backend.in
+++ b/test/rlhc.d/case/cond7_cs.cs-A-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_cs.cs-A-F0--var-backend.exp b/test/rlhc.d/case/cond7_cs.cs-A-F0--var-backend.exp
index 16520e09..16520e09 100644
--- a/test/cases/rlhc.d/case/cond7_cs.cs-A-F0--var-backend.exp
+++ b/test/rlhc.d/case/cond7_cs.cs-A-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_cs.cs-A-F0--var-backend.in b/test/rlhc.d/case/cond7_cs.cs-A-F0--var-backend.in
index f1176ec8..f1176ec8 100644
--- a/test/cases/rlhc.d/case/cond7_cs.cs-A-F0--var-backend.in
+++ b/test/rlhc.d/case/cond7_cs.cs-A-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_cs.cs-A-F1--goto-backend.exp b/test/rlhc.d/case/cond7_cs.cs-A-F1--goto-backend.exp
index e8cfd7f8..e8cfd7f8 100644
--- a/test/cases/rlhc.d/case/cond7_cs.cs-A-F1--goto-backend.exp
+++ b/test/rlhc.d/case/cond7_cs.cs-A-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_cs.cs-A-F1--goto-backend.in b/test/rlhc.d/case/cond7_cs.cs-A-F1--goto-backend.in
index 8b8081f0..8b8081f0 100644
--- a/test/cases/rlhc.d/case/cond7_cs.cs-A-F1--goto-backend.in
+++ b/test/rlhc.d/case/cond7_cs.cs-A-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_cs.cs-A-F1--var-backend.exp b/test/rlhc.d/case/cond7_cs.cs-A-F1--var-backend.exp
index 689d73ed..689d73ed 100644
--- a/test/cases/rlhc.d/case/cond7_cs.cs-A-F1--var-backend.exp
+++ b/test/rlhc.d/case/cond7_cs.cs-A-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_cs.cs-A-F1--var-backend.in b/test/rlhc.d/case/cond7_cs.cs-A-F1--var-backend.in
index 2ed8c418..2ed8c418 100644
--- a/test/cases/rlhc.d/case/cond7_cs.cs-A-F1--var-backend.in
+++ b/test/rlhc.d/case/cond7_cs.cs-A-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_cs.cs-A-G0--goto-backend.exp b/test/rlhc.d/case/cond7_cs.cs-A-G0--goto-backend.exp
index 97e69cab..97e69cab 100644
--- a/test/cases/rlhc.d/case/cond7_cs.cs-A-G0--goto-backend.exp
+++ b/test/rlhc.d/case/cond7_cs.cs-A-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_cs.cs-A-G0--goto-backend.in b/test/rlhc.d/case/cond7_cs.cs-A-G0--goto-backend.in
index 9a4d3346..9a4d3346 100644
--- a/test/cases/rlhc.d/case/cond7_cs.cs-A-G0--goto-backend.in
+++ b/test/rlhc.d/case/cond7_cs.cs-A-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_cs.cs-A-G1--goto-backend.exp b/test/rlhc.d/case/cond7_cs.cs-A-G1--goto-backend.exp
index 2a326213..2a326213 100644
--- a/test/cases/rlhc.d/case/cond7_cs.cs-A-G1--goto-backend.exp
+++ b/test/rlhc.d/case/cond7_cs.cs-A-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_cs.cs-A-G1--goto-backend.in b/test/rlhc.d/case/cond7_cs.cs-A-G1--goto-backend.in
index b49d08ad..b49d08ad 100644
--- a/test/cases/rlhc.d/case/cond7_cs.cs-A-G1--goto-backend.in
+++ b/test/rlhc.d/case/cond7_cs.cs-A-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_cs.cs-A-T0--goto-backend.exp b/test/rlhc.d/case/cond7_cs.cs-A-T0--goto-backend.exp
index 9040823e..9040823e 100644
--- a/test/cases/rlhc.d/case/cond7_cs.cs-A-T0--goto-backend.exp
+++ b/test/rlhc.d/case/cond7_cs.cs-A-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_cs.cs-A-T0--goto-backend.in b/test/rlhc.d/case/cond7_cs.cs-A-T0--goto-backend.in
index c21d56d0..c21d56d0 100644
--- a/test/cases/rlhc.d/case/cond7_cs.cs-A-T0--goto-backend.in
+++ b/test/rlhc.d/case/cond7_cs.cs-A-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_cs.cs-A-T0--var-backend.exp b/test/rlhc.d/case/cond7_cs.cs-A-T0--var-backend.exp
index 4ff873ca..4ff873ca 100644
--- a/test/cases/rlhc.d/case/cond7_cs.cs-A-T0--var-backend.exp
+++ b/test/rlhc.d/case/cond7_cs.cs-A-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_cs.cs-A-T0--var-backend.in b/test/rlhc.d/case/cond7_cs.cs-A-T0--var-backend.in
index 60ccfa19..60ccfa19 100644
--- a/test/cases/rlhc.d/case/cond7_cs.cs-A-T0--var-backend.in
+++ b/test/rlhc.d/case/cond7_cs.cs-A-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_cs.cs-A-T1--goto-backend.exp b/test/rlhc.d/case/cond7_cs.cs-A-T1--goto-backend.exp
index 1b7b38fb..1b7b38fb 100644
--- a/test/cases/rlhc.d/case/cond7_cs.cs-A-T1--goto-backend.exp
+++ b/test/rlhc.d/case/cond7_cs.cs-A-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_cs.cs-A-T1--goto-backend.in b/test/rlhc.d/case/cond7_cs.cs-A-T1--goto-backend.in
index e2fbbe6a..e2fbbe6a 100644
--- a/test/cases/rlhc.d/case/cond7_cs.cs-A-T1--goto-backend.in
+++ b/test/rlhc.d/case/cond7_cs.cs-A-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_cs.cs-A-T1--var-backend.exp b/test/rlhc.d/case/cond7_cs.cs-A-T1--var-backend.exp
index dc578eab..dc578eab 100644
--- a/test/cases/rlhc.d/case/cond7_cs.cs-A-T1--var-backend.exp
+++ b/test/rlhc.d/case/cond7_cs.cs-A-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_cs.cs-A-T1--var-backend.in b/test/rlhc.d/case/cond7_cs.cs-A-T1--var-backend.in
index b5376269..b5376269 100644
--- a/test/cases/rlhc.d/case/cond7_cs.cs-A-T1--var-backend.in
+++ b/test/rlhc.d/case/cond7_cs.cs-A-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_go.go-Z-F0--goto-backend.exp b/test/rlhc.d/case/cond7_go.go-Z-F0--goto-backend.exp
index 040b200b..040b200b 100644
--- a/test/cases/rlhc.d/case/cond7_go.go-Z-F0--goto-backend.exp
+++ b/test/rlhc.d/case/cond7_go.go-Z-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_go.go-Z-F0--goto-backend.in b/test/rlhc.d/case/cond7_go.go-Z-F0--goto-backend.in
index 0cd4b545..0cd4b545 100644
--- a/test/cases/rlhc.d/case/cond7_go.go-Z-F0--goto-backend.in
+++ b/test/rlhc.d/case/cond7_go.go-Z-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_go.go-Z-F0--var-backend.exp b/test/rlhc.d/case/cond7_go.go-Z-F0--var-backend.exp
index 28b08067..28b08067 100644
--- a/test/cases/rlhc.d/case/cond7_go.go-Z-F0--var-backend.exp
+++ b/test/rlhc.d/case/cond7_go.go-Z-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_go.go-Z-F0--var-backend.in b/test/rlhc.d/case/cond7_go.go-Z-F0--var-backend.in
index f1d258fe..f1d258fe 100644
--- a/test/cases/rlhc.d/case/cond7_go.go-Z-F0--var-backend.in
+++ b/test/rlhc.d/case/cond7_go.go-Z-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_go.go-Z-F1--goto-backend.exp b/test/rlhc.d/case/cond7_go.go-Z-F1--goto-backend.exp
index 77d94b4d..77d94b4d 100644
--- a/test/cases/rlhc.d/case/cond7_go.go-Z-F1--goto-backend.exp
+++ b/test/rlhc.d/case/cond7_go.go-Z-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_go.go-Z-F1--goto-backend.in b/test/rlhc.d/case/cond7_go.go-Z-F1--goto-backend.in
index ef86d2e1..ef86d2e1 100644
--- a/test/cases/rlhc.d/case/cond7_go.go-Z-F1--goto-backend.in
+++ b/test/rlhc.d/case/cond7_go.go-Z-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_go.go-Z-F1--var-backend.exp b/test/rlhc.d/case/cond7_go.go-Z-F1--var-backend.exp
index a4f118f1..a4f118f1 100644
--- a/test/cases/rlhc.d/case/cond7_go.go-Z-F1--var-backend.exp
+++ b/test/rlhc.d/case/cond7_go.go-Z-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_go.go-Z-F1--var-backend.in b/test/rlhc.d/case/cond7_go.go-Z-F1--var-backend.in
index 13dc26bd..13dc26bd 100644
--- a/test/cases/rlhc.d/case/cond7_go.go-Z-F1--var-backend.in
+++ b/test/rlhc.d/case/cond7_go.go-Z-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_go.go-Z-G0--goto-backend.exp b/test/rlhc.d/case/cond7_go.go-Z-G0--goto-backend.exp
index 4862b778..4862b778 100644
--- a/test/cases/rlhc.d/case/cond7_go.go-Z-G0--goto-backend.exp
+++ b/test/rlhc.d/case/cond7_go.go-Z-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_go.go-Z-G0--goto-backend.in b/test/rlhc.d/case/cond7_go.go-Z-G0--goto-backend.in
index a22c595b..a22c595b 100644
--- a/test/cases/rlhc.d/case/cond7_go.go-Z-G0--goto-backend.in
+++ b/test/rlhc.d/case/cond7_go.go-Z-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_go.go-Z-G1--goto-backend.exp b/test/rlhc.d/case/cond7_go.go-Z-G1--goto-backend.exp
index 52329d95..52329d95 100644
--- a/test/cases/rlhc.d/case/cond7_go.go-Z-G1--goto-backend.exp
+++ b/test/rlhc.d/case/cond7_go.go-Z-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_go.go-Z-G1--goto-backend.in b/test/rlhc.d/case/cond7_go.go-Z-G1--goto-backend.in
index 90912813..90912813 100644
--- a/test/cases/rlhc.d/case/cond7_go.go-Z-G1--goto-backend.in
+++ b/test/rlhc.d/case/cond7_go.go-Z-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_go.go-Z-G2--goto-backend.exp b/test/rlhc.d/case/cond7_go.go-Z-G2--goto-backend.exp
index fc1add34..fc1add34 100644
--- a/test/cases/rlhc.d/case/cond7_go.go-Z-G2--goto-backend.exp
+++ b/test/rlhc.d/case/cond7_go.go-Z-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_go.go-Z-G2--goto-backend.in b/test/rlhc.d/case/cond7_go.go-Z-G2--goto-backend.in
index 928d4c3c..928d4c3c 100644
--- a/test/cases/rlhc.d/case/cond7_go.go-Z-G2--goto-backend.in
+++ b/test/rlhc.d/case/cond7_go.go-Z-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_go.go-Z-T0--goto-backend.exp b/test/rlhc.d/case/cond7_go.go-Z-T0--goto-backend.exp
index 49947199..49947199 100644
--- a/test/cases/rlhc.d/case/cond7_go.go-Z-T0--goto-backend.exp
+++ b/test/rlhc.d/case/cond7_go.go-Z-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_go.go-Z-T0--goto-backend.in b/test/rlhc.d/case/cond7_go.go-Z-T0--goto-backend.in
index d023c5bd..d023c5bd 100644
--- a/test/cases/rlhc.d/case/cond7_go.go-Z-T0--goto-backend.in
+++ b/test/rlhc.d/case/cond7_go.go-Z-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_go.go-Z-T0--var-backend.exp b/test/rlhc.d/case/cond7_go.go-Z-T0--var-backend.exp
index fa1213be..fa1213be 100644
--- a/test/cases/rlhc.d/case/cond7_go.go-Z-T0--var-backend.exp
+++ b/test/rlhc.d/case/cond7_go.go-Z-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_go.go-Z-T0--var-backend.in b/test/rlhc.d/case/cond7_go.go-Z-T0--var-backend.in
index 7ca9787c..7ca9787c 100644
--- a/test/cases/rlhc.d/case/cond7_go.go-Z-T0--var-backend.in
+++ b/test/rlhc.d/case/cond7_go.go-Z-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_go.go-Z-T1--goto-backend.exp b/test/rlhc.d/case/cond7_go.go-Z-T1--goto-backend.exp
index 0142a665..0142a665 100644
--- a/test/cases/rlhc.d/case/cond7_go.go-Z-T1--goto-backend.exp
+++ b/test/rlhc.d/case/cond7_go.go-Z-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_go.go-Z-T1--goto-backend.in b/test/rlhc.d/case/cond7_go.go-Z-T1--goto-backend.in
index 7fa6a2bf..7fa6a2bf 100644
--- a/test/cases/rlhc.d/case/cond7_go.go-Z-T1--goto-backend.in
+++ b/test/rlhc.d/case/cond7_go.go-Z-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_go.go-Z-T1--var-backend.exp b/test/rlhc.d/case/cond7_go.go-Z-T1--var-backend.exp
index 472bd7e3..472bd7e3 100644
--- a/test/cases/rlhc.d/case/cond7_go.go-Z-T1--var-backend.exp
+++ b/test/rlhc.d/case/cond7_go.go-Z-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_go.go-Z-T1--var-backend.in b/test/rlhc.d/case/cond7_go.go-Z-T1--var-backend.in
index 92817faa..92817faa 100644
--- a/test/cases/rlhc.d/case/cond7_go.go-Z-T1--var-backend.in
+++ b/test/rlhc.d/case/cond7_go.go-Z-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_java.java-J-F0--goto-backend.exp b/test/rlhc.d/case/cond7_java.java-J-F0--goto-backend.exp
index 01a26f2a..01a26f2a 100644
--- a/test/cases/rlhc.d/case/cond7_java.java-J-F0--goto-backend.exp
+++ b/test/rlhc.d/case/cond7_java.java-J-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_java.java-J-F0--goto-backend.in b/test/rlhc.d/case/cond7_java.java-J-F0--goto-backend.in
index f5206357..f5206357 100644
--- a/test/cases/rlhc.d/case/cond7_java.java-J-F0--goto-backend.in
+++ b/test/rlhc.d/case/cond7_java.java-J-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_java.java-J-F0--var-backend.exp b/test/rlhc.d/case/cond7_java.java-J-F0--var-backend.exp
index 808180b7..808180b7 100644
--- a/test/cases/rlhc.d/case/cond7_java.java-J-F0--var-backend.exp
+++ b/test/rlhc.d/case/cond7_java.java-J-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_java.java-J-F0--var-backend.in b/test/rlhc.d/case/cond7_java.java-J-F0--var-backend.in
index ccc3cd05..ccc3cd05 100644
--- a/test/cases/rlhc.d/case/cond7_java.java-J-F0--var-backend.in
+++ b/test/rlhc.d/case/cond7_java.java-J-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_java.java-J-F1--goto-backend.exp b/test/rlhc.d/case/cond7_java.java-J-F1--goto-backend.exp
index 3608016f..3608016f 100644
--- a/test/cases/rlhc.d/case/cond7_java.java-J-F1--goto-backend.exp
+++ b/test/rlhc.d/case/cond7_java.java-J-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_java.java-J-F1--goto-backend.in b/test/rlhc.d/case/cond7_java.java-J-F1--goto-backend.in
index 123d1766..123d1766 100644
--- a/test/cases/rlhc.d/case/cond7_java.java-J-F1--goto-backend.in
+++ b/test/rlhc.d/case/cond7_java.java-J-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_java.java-J-F1--var-backend.exp b/test/rlhc.d/case/cond7_java.java-J-F1--var-backend.exp
index 9ec61dc9..9ec61dc9 100644
--- a/test/cases/rlhc.d/case/cond7_java.java-J-F1--var-backend.exp
+++ b/test/rlhc.d/case/cond7_java.java-J-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_java.java-J-F1--var-backend.in b/test/rlhc.d/case/cond7_java.java-J-F1--var-backend.in
index 294c63c8..294c63c8 100644
--- a/test/cases/rlhc.d/case/cond7_java.java-J-F1--var-backend.in
+++ b/test/rlhc.d/case/cond7_java.java-J-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_java.java-J-T0--goto-backend.exp b/test/rlhc.d/case/cond7_java.java-J-T0--goto-backend.exp
index 2192e663..2192e663 100644
--- a/test/cases/rlhc.d/case/cond7_java.java-J-T0--goto-backend.exp
+++ b/test/rlhc.d/case/cond7_java.java-J-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_java.java-J-T0--goto-backend.in b/test/rlhc.d/case/cond7_java.java-J-T0--goto-backend.in
index c95b11bb..c95b11bb 100644
--- a/test/cases/rlhc.d/case/cond7_java.java-J-T0--goto-backend.in
+++ b/test/rlhc.d/case/cond7_java.java-J-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_java.java-J-T0--var-backend.exp b/test/rlhc.d/case/cond7_java.java-J-T0--var-backend.exp
index 5c1f85c4..5c1f85c4 100644
--- a/test/cases/rlhc.d/case/cond7_java.java-J-T0--var-backend.exp
+++ b/test/rlhc.d/case/cond7_java.java-J-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_java.java-J-T0--var-backend.in b/test/rlhc.d/case/cond7_java.java-J-T0--var-backend.in
index d54ea62f..d54ea62f 100644
--- a/test/cases/rlhc.d/case/cond7_java.java-J-T0--var-backend.in
+++ b/test/rlhc.d/case/cond7_java.java-J-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_java.java-J-T1--goto-backend.exp b/test/rlhc.d/case/cond7_java.java-J-T1--goto-backend.exp
index cfc888d0..cfc888d0 100644
--- a/test/cases/rlhc.d/case/cond7_java.java-J-T1--goto-backend.exp
+++ b/test/rlhc.d/case/cond7_java.java-J-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_java.java-J-T1--goto-backend.in b/test/rlhc.d/case/cond7_java.java-J-T1--goto-backend.in
index 563d1f77..563d1f77 100644
--- a/test/cases/rlhc.d/case/cond7_java.java-J-T1--goto-backend.in
+++ b/test/rlhc.d/case/cond7_java.java-J-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_java.java-J-T1--var-backend.exp b/test/rlhc.d/case/cond7_java.java-J-T1--var-backend.exp
index 72c44289..72c44289 100644
--- a/test/cases/rlhc.d/case/cond7_java.java-J-T1--var-backend.exp
+++ b/test/rlhc.d/case/cond7_java.java-J-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_java.java-J-T1--var-backend.in b/test/rlhc.d/case/cond7_java.java-J-T1--var-backend.in
index 0919d09b..0919d09b 100644
--- a/test/cases/rlhc.d/case/cond7_java.java-J-T1--var-backend.in
+++ b/test/rlhc.d/case/cond7_java.java-J-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_julia.jl-Y-F0--var-backend.exp b/test/rlhc.d/case/cond7_julia.jl-Y-F0--var-backend.exp
index 5da5324d..5da5324d 100644
--- a/test/cases/rlhc.d/case/cond7_julia.jl-Y-F0--var-backend.exp
+++ b/test/rlhc.d/case/cond7_julia.jl-Y-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_julia.jl-Y-F0--var-backend.in b/test/rlhc.d/case/cond7_julia.jl-Y-F0--var-backend.in
index 66cd0fb7..66cd0fb7 100644
--- a/test/cases/rlhc.d/case/cond7_julia.jl-Y-F0--var-backend.in
+++ b/test/rlhc.d/case/cond7_julia.jl-Y-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_julia.jl-Y-F1--var-backend.exp b/test/rlhc.d/case/cond7_julia.jl-Y-F1--var-backend.exp
index e762e4a5..e762e4a5 100644
--- a/test/cases/rlhc.d/case/cond7_julia.jl-Y-F1--var-backend.exp
+++ b/test/rlhc.d/case/cond7_julia.jl-Y-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_julia.jl-Y-F1--var-backend.in b/test/rlhc.d/case/cond7_julia.jl-Y-F1--var-backend.in
index c45a98d3..c45a98d3 100644
--- a/test/cases/rlhc.d/case/cond7_julia.jl-Y-F1--var-backend.in
+++ b/test/rlhc.d/case/cond7_julia.jl-Y-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_julia.jl-Y-T0--var-backend.exp b/test/rlhc.d/case/cond7_julia.jl-Y-T0--var-backend.exp
index 25ec14c8..25ec14c8 100644
--- a/test/cases/rlhc.d/case/cond7_julia.jl-Y-T0--var-backend.exp
+++ b/test/rlhc.d/case/cond7_julia.jl-Y-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_julia.jl-Y-T0--var-backend.in b/test/rlhc.d/case/cond7_julia.jl-Y-T0--var-backend.in
index 2f20dfed..2f20dfed 100644
--- a/test/cases/rlhc.d/case/cond7_julia.jl-Y-T0--var-backend.in
+++ b/test/rlhc.d/case/cond7_julia.jl-Y-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_julia.jl-Y-T1--var-backend.exp b/test/rlhc.d/case/cond7_julia.jl-Y-T1--var-backend.exp
index 62c7a51e..62c7a51e 100644
--- a/test/cases/rlhc.d/case/cond7_julia.jl-Y-T1--var-backend.exp
+++ b/test/rlhc.d/case/cond7_julia.jl-Y-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_julia.jl-Y-T1--var-backend.in b/test/rlhc.d/case/cond7_julia.jl-Y-T1--var-backend.in
index 0512b6e7..0512b6e7 100644
--- a/test/cases/rlhc.d/case/cond7_julia.jl-Y-T1--var-backend.in
+++ b/test/rlhc.d/case/cond7_julia.jl-Y-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_ocaml.ml-O-F0--var-backend.exp b/test/rlhc.d/case/cond7_ocaml.ml-O-F0--var-backend.exp
index f94c7a91..f94c7a91 100644
--- a/test/cases/rlhc.d/case/cond7_ocaml.ml-O-F0--var-backend.exp
+++ b/test/rlhc.d/case/cond7_ocaml.ml-O-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_ocaml.ml-O-F0--var-backend.in b/test/rlhc.d/case/cond7_ocaml.ml-O-F0--var-backend.in
index 15b1a862..15b1a862 100644
--- a/test/cases/rlhc.d/case/cond7_ocaml.ml-O-F0--var-backend.in
+++ b/test/rlhc.d/case/cond7_ocaml.ml-O-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_ocaml.ml-O-F1--var-backend.exp b/test/rlhc.d/case/cond7_ocaml.ml-O-F1--var-backend.exp
index ebfbed8b..ebfbed8b 100644
--- a/test/cases/rlhc.d/case/cond7_ocaml.ml-O-F1--var-backend.exp
+++ b/test/rlhc.d/case/cond7_ocaml.ml-O-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_ocaml.ml-O-F1--var-backend.in b/test/rlhc.d/case/cond7_ocaml.ml-O-F1--var-backend.in
index fa736f5a..fa736f5a 100644
--- a/test/cases/rlhc.d/case/cond7_ocaml.ml-O-F1--var-backend.in
+++ b/test/rlhc.d/case/cond7_ocaml.ml-O-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_ocaml.ml-O-T0--var-backend.exp b/test/rlhc.d/case/cond7_ocaml.ml-O-T0--var-backend.exp
index c337c392..c337c392 100644
--- a/test/cases/rlhc.d/case/cond7_ocaml.ml-O-T0--var-backend.exp
+++ b/test/rlhc.d/case/cond7_ocaml.ml-O-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_ocaml.ml-O-T0--var-backend.in b/test/rlhc.d/case/cond7_ocaml.ml-O-T0--var-backend.in
index df48dffc..df48dffc 100644
--- a/test/cases/rlhc.d/case/cond7_ocaml.ml-O-T0--var-backend.in
+++ b/test/rlhc.d/case/cond7_ocaml.ml-O-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_ocaml.ml-O-T1--var-backend.exp b/test/rlhc.d/case/cond7_ocaml.ml-O-T1--var-backend.exp
index ca00fff6..ca00fff6 100644
--- a/test/cases/rlhc.d/case/cond7_ocaml.ml-O-T1--var-backend.exp
+++ b/test/rlhc.d/case/cond7_ocaml.ml-O-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_ocaml.ml-O-T1--var-backend.in b/test/rlhc.d/case/cond7_ocaml.ml-O-T1--var-backend.in
index e32bc8dc..e32bc8dc 100644
--- a/test/cases/rlhc.d/case/cond7_ocaml.ml-O-T1--var-backend.in
+++ b/test/rlhc.d/case/cond7_ocaml.ml-O-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_ruby.rb-R-F0--var-backend.exp b/test/rlhc.d/case/cond7_ruby.rb-R-F0--var-backend.exp
index fe3414ad..fe3414ad 100644
--- a/test/cases/rlhc.d/case/cond7_ruby.rb-R-F0--var-backend.exp
+++ b/test/rlhc.d/case/cond7_ruby.rb-R-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_ruby.rb-R-F0--var-backend.in b/test/rlhc.d/case/cond7_ruby.rb-R-F0--var-backend.in
index 0afc94d5..0afc94d5 100644
--- a/test/cases/rlhc.d/case/cond7_ruby.rb-R-F0--var-backend.in
+++ b/test/rlhc.d/case/cond7_ruby.rb-R-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_ruby.rb-R-F1--var-backend.exp b/test/rlhc.d/case/cond7_ruby.rb-R-F1--var-backend.exp
index cb58b3fe..cb58b3fe 100644
--- a/test/cases/rlhc.d/case/cond7_ruby.rb-R-F1--var-backend.exp
+++ b/test/rlhc.d/case/cond7_ruby.rb-R-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_ruby.rb-R-F1--var-backend.in b/test/rlhc.d/case/cond7_ruby.rb-R-F1--var-backend.in
index d516d4ce..d516d4ce 100644
--- a/test/cases/rlhc.d/case/cond7_ruby.rb-R-F1--var-backend.in
+++ b/test/rlhc.d/case/cond7_ruby.rb-R-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_ruby.rb-R-T0--var-backend.exp b/test/rlhc.d/case/cond7_ruby.rb-R-T0--var-backend.exp
index 5307fbcd..5307fbcd 100644
--- a/test/cases/rlhc.d/case/cond7_ruby.rb-R-T0--var-backend.exp
+++ b/test/rlhc.d/case/cond7_ruby.rb-R-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_ruby.rb-R-T0--var-backend.in b/test/rlhc.d/case/cond7_ruby.rb-R-T0--var-backend.in
index 41876ffb..41876ffb 100644
--- a/test/cases/rlhc.d/case/cond7_ruby.rb-R-T0--var-backend.in
+++ b/test/rlhc.d/case/cond7_ruby.rb-R-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_ruby.rb-R-T1--var-backend.exp b/test/rlhc.d/case/cond7_ruby.rb-R-T1--var-backend.exp
index 5d976667..5d976667 100644
--- a/test/cases/rlhc.d/case/cond7_ruby.rb-R-T1--var-backend.exp
+++ b/test/rlhc.d/case/cond7_ruby.rb-R-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_ruby.rb-R-T1--var-backend.in b/test/rlhc.d/case/cond7_ruby.rb-R-T1--var-backend.in
index 73ed7758..73ed7758 100644
--- a/test/cases/rlhc.d/case/cond7_ruby.rb-R-T1--var-backend.in
+++ b/test/rlhc.d/case/cond7_ruby.rb-R-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_rust.rs-U-F0--var-backend.exp b/test/rlhc.d/case/cond7_rust.rs-U-F0--var-backend.exp
index a0352d7f..a0352d7f 100644
--- a/test/cases/rlhc.d/case/cond7_rust.rs-U-F0--var-backend.exp
+++ b/test/rlhc.d/case/cond7_rust.rs-U-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_rust.rs-U-F0--var-backend.in b/test/rlhc.d/case/cond7_rust.rs-U-F0--var-backend.in
index b4067ce2..b4067ce2 100644
--- a/test/cases/rlhc.d/case/cond7_rust.rs-U-F0--var-backend.in
+++ b/test/rlhc.d/case/cond7_rust.rs-U-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_rust.rs-U-F1--var-backend.exp b/test/rlhc.d/case/cond7_rust.rs-U-F1--var-backend.exp
index f98b49b8..f98b49b8 100644
--- a/test/cases/rlhc.d/case/cond7_rust.rs-U-F1--var-backend.exp
+++ b/test/rlhc.d/case/cond7_rust.rs-U-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_rust.rs-U-F1--var-backend.in b/test/rlhc.d/case/cond7_rust.rs-U-F1--var-backend.in
index 09cb468d..09cb468d 100644
--- a/test/cases/rlhc.d/case/cond7_rust.rs-U-F1--var-backend.in
+++ b/test/rlhc.d/case/cond7_rust.rs-U-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_rust.rs-U-T0--var-backend.exp b/test/rlhc.d/case/cond7_rust.rs-U-T0--var-backend.exp
index d041a963..d041a963 100644
--- a/test/cases/rlhc.d/case/cond7_rust.rs-U-T0--var-backend.exp
+++ b/test/rlhc.d/case/cond7_rust.rs-U-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_rust.rs-U-T0--var-backend.in b/test/rlhc.d/case/cond7_rust.rs-U-T0--var-backend.in
index ceff6a6b..ceff6a6b 100644
--- a/test/cases/rlhc.d/case/cond7_rust.rs-U-T0--var-backend.in
+++ b/test/rlhc.d/case/cond7_rust.rs-U-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond7_rust.rs-U-T1--var-backend.exp b/test/rlhc.d/case/cond7_rust.rs-U-T1--var-backend.exp
index 01d2aec1..01d2aec1 100644
--- a/test/cases/rlhc.d/case/cond7_rust.rs-U-T1--var-backend.exp
+++ b/test/rlhc.d/case/cond7_rust.rs-U-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond7_rust.rs-U-T1--var-backend.in b/test/rlhc.d/case/cond7_rust.rs-U-T1--var-backend.in
index fbbd8862..fbbd8862 100644
--- a/test/cases/rlhc.d/case/cond7_rust.rs-U-T1--var-backend.in
+++ b/test/rlhc.d/case/cond7_rust.rs-U-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond8.ml-O-F0--var-backend.exp b/test/rlhc.d/case/cond8.ml-O-F0--var-backend.exp
index 6df797af..6df797af 100644
--- a/test/cases/rlhc.d/case/cond8.ml-O-F0--var-backend.exp
+++ b/test/rlhc.d/case/cond8.ml-O-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond8.ml-O-F0--var-backend.in b/test/rlhc.d/case/cond8.ml-O-F0--var-backend.in
index 8c3b1dba..8c3b1dba 100644
--- a/test/cases/rlhc.d/case/cond8.ml-O-F0--var-backend.in
+++ b/test/rlhc.d/case/cond8.ml-O-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond8.ml-O-F1--var-backend.exp b/test/rlhc.d/case/cond8.ml-O-F1--var-backend.exp
index 90970224..90970224 100644
--- a/test/cases/rlhc.d/case/cond8.ml-O-F1--var-backend.exp
+++ b/test/rlhc.d/case/cond8.ml-O-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond8.ml-O-F1--var-backend.in b/test/rlhc.d/case/cond8.ml-O-F1--var-backend.in
index f429b13d..f429b13d 100644
--- a/test/cases/rlhc.d/case/cond8.ml-O-F1--var-backend.in
+++ b/test/rlhc.d/case/cond8.ml-O-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond8.ml-O-T0--var-backend.exp b/test/rlhc.d/case/cond8.ml-O-T0--var-backend.exp
index 78651182..78651182 100644
--- a/test/cases/rlhc.d/case/cond8.ml-O-T0--var-backend.exp
+++ b/test/rlhc.d/case/cond8.ml-O-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond8.ml-O-T0--var-backend.in b/test/rlhc.d/case/cond8.ml-O-T0--var-backend.in
index 68d6ea57..68d6ea57 100644
--- a/test/cases/rlhc.d/case/cond8.ml-O-T0--var-backend.in
+++ b/test/rlhc.d/case/cond8.ml-O-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cond8.ml-O-T1--var-backend.exp b/test/rlhc.d/case/cond8.ml-O-T1--var-backend.exp
index f7cd07a4..f7cd07a4 100644
--- a/test/cases/rlhc.d/case/cond8.ml-O-T1--var-backend.exp
+++ b/test/rlhc.d/case/cond8.ml-O-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cond8.ml-O-T1--var-backend.in b/test/rlhc.d/case/cond8.ml-O-T1--var-backend.in
index b2039b4f..b2039b4f 100644
--- a/test/cases/rlhc.d/case/cond8.ml-O-T1--var-backend.in
+++ b/test/rlhc.d/case/cond8.ml-O-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/conderr1.cpp-C-F0--goto-backend.exp b/test/rlhc.d/case/conderr1.cpp-C-F0--goto-backend.exp
index b9ec3918..b9ec3918 100644
--- a/test/cases/rlhc.d/case/conderr1.cpp-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/conderr1.cpp-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/conderr1.cpp-C-F0--goto-backend.in b/test/rlhc.d/case/conderr1.cpp-C-F0--goto-backend.in
index 48623ba9..48623ba9 100644
--- a/test/cases/rlhc.d/case/conderr1.cpp-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/conderr1.cpp-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/conderr1.cpp-C-F0--var-backend.exp b/test/rlhc.d/case/conderr1.cpp-C-F0--var-backend.exp
index 7825f1ef..7825f1ef 100644
--- a/test/cases/rlhc.d/case/conderr1.cpp-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/conderr1.cpp-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/conderr1.cpp-C-F0--var-backend.in b/test/rlhc.d/case/conderr1.cpp-C-F0--var-backend.in
index 1ed75fcb..1ed75fcb 100644
--- a/test/cases/rlhc.d/case/conderr1.cpp-C-F0--var-backend.in
+++ b/test/rlhc.d/case/conderr1.cpp-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/conderr1.cpp-C-F1--goto-backend.exp b/test/rlhc.d/case/conderr1.cpp-C-F1--goto-backend.exp
index 402581f6..402581f6 100644
--- a/test/cases/rlhc.d/case/conderr1.cpp-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/conderr1.cpp-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/conderr1.cpp-C-F1--goto-backend.in b/test/rlhc.d/case/conderr1.cpp-C-F1--goto-backend.in
index 0b0af860..0b0af860 100644
--- a/test/cases/rlhc.d/case/conderr1.cpp-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/conderr1.cpp-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/conderr1.cpp-C-F1--var-backend.exp b/test/rlhc.d/case/conderr1.cpp-C-F1--var-backend.exp
index f1f68354..f1f68354 100644
--- a/test/cases/rlhc.d/case/conderr1.cpp-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/conderr1.cpp-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/conderr1.cpp-C-F1--var-backend.in b/test/rlhc.d/case/conderr1.cpp-C-F1--var-backend.in
index a350caba..a350caba 100644
--- a/test/cases/rlhc.d/case/conderr1.cpp-C-F1--var-backend.in
+++ b/test/rlhc.d/case/conderr1.cpp-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/conderr1.cpp-C-G0--goto-backend.exp b/test/rlhc.d/case/conderr1.cpp-C-G0--goto-backend.exp
index ede8ae5d..ede8ae5d 100644
--- a/test/cases/rlhc.d/case/conderr1.cpp-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/conderr1.cpp-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/conderr1.cpp-C-G0--goto-backend.in b/test/rlhc.d/case/conderr1.cpp-C-G0--goto-backend.in
index 722ffe1e..722ffe1e 100644
--- a/test/cases/rlhc.d/case/conderr1.cpp-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/conderr1.cpp-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/conderr1.cpp-C-G1--goto-backend.exp b/test/rlhc.d/case/conderr1.cpp-C-G1--goto-backend.exp
index fb3064c7..fb3064c7 100644
--- a/test/cases/rlhc.d/case/conderr1.cpp-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/conderr1.cpp-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/conderr1.cpp-C-G1--goto-backend.in b/test/rlhc.d/case/conderr1.cpp-C-G1--goto-backend.in
index 0cd46931..0cd46931 100644
--- a/test/cases/rlhc.d/case/conderr1.cpp-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/conderr1.cpp-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/conderr1.cpp-C-G2--goto-backend.exp b/test/rlhc.d/case/conderr1.cpp-C-G2--goto-backend.exp
index 9614b524..9614b524 100644
--- a/test/cases/rlhc.d/case/conderr1.cpp-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/conderr1.cpp-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/conderr1.cpp-C-G2--goto-backend.in b/test/rlhc.d/case/conderr1.cpp-C-G2--goto-backend.in
index badc1fe3..badc1fe3 100644
--- a/test/cases/rlhc.d/case/conderr1.cpp-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/conderr1.cpp-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/conderr1.cpp-C-T0--goto-backend.exp b/test/rlhc.d/case/conderr1.cpp-C-T0--goto-backend.exp
index c33afff3..c33afff3 100644
--- a/test/cases/rlhc.d/case/conderr1.cpp-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/conderr1.cpp-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/conderr1.cpp-C-T0--goto-backend.in b/test/rlhc.d/case/conderr1.cpp-C-T0--goto-backend.in
index 23435c87..23435c87 100644
--- a/test/cases/rlhc.d/case/conderr1.cpp-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/conderr1.cpp-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/conderr1.cpp-C-T0--var-backend.exp b/test/rlhc.d/case/conderr1.cpp-C-T0--var-backend.exp
index 6211f9ab..6211f9ab 100644
--- a/test/cases/rlhc.d/case/conderr1.cpp-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/conderr1.cpp-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/conderr1.cpp-C-T0--var-backend.in b/test/rlhc.d/case/conderr1.cpp-C-T0--var-backend.in
index 90ae057d..90ae057d 100644
--- a/test/cases/rlhc.d/case/conderr1.cpp-C-T0--var-backend.in
+++ b/test/rlhc.d/case/conderr1.cpp-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/conderr1.cpp-C-T1--goto-backend.exp b/test/rlhc.d/case/conderr1.cpp-C-T1--goto-backend.exp
index 63802cdd..63802cdd 100644
--- a/test/cases/rlhc.d/case/conderr1.cpp-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/conderr1.cpp-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/conderr1.cpp-C-T1--goto-backend.in b/test/rlhc.d/case/conderr1.cpp-C-T1--goto-backend.in
index 590194f6..590194f6 100644
--- a/test/cases/rlhc.d/case/conderr1.cpp-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/conderr1.cpp-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/conderr1.cpp-C-T1--var-backend.exp b/test/rlhc.d/case/conderr1.cpp-C-T1--var-backend.exp
index 82a7e718..82a7e718 100644
--- a/test/cases/rlhc.d/case/conderr1.cpp-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/conderr1.cpp-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/conderr1.cpp-C-T1--var-backend.in b/test/rlhc.d/case/conderr1.cpp-C-T1--var-backend.in
index 139e6781..139e6781 100644
--- a/test/cases/rlhc.d/case/conderr1.cpp-C-T1--var-backend.in
+++ b/test/rlhc.d/case/conderr1.cpp-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/conderr2.c-C-F0--goto-backend.exp b/test/rlhc.d/case/conderr2.c-C-F0--goto-backend.exp
index 15fb6fdc..15fb6fdc 100644
--- a/test/cases/rlhc.d/case/conderr2.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/conderr2.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/conderr2.c-C-F0--goto-backend.in b/test/rlhc.d/case/conderr2.c-C-F0--goto-backend.in
index 1fa1512c..1fa1512c 100644
--- a/test/cases/rlhc.d/case/conderr2.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/conderr2.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/conderr2.c-C-F0--var-backend.exp b/test/rlhc.d/case/conderr2.c-C-F0--var-backend.exp
index 15ebf03e..15ebf03e 100644
--- a/test/cases/rlhc.d/case/conderr2.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/conderr2.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/conderr2.c-C-F0--var-backend.in b/test/rlhc.d/case/conderr2.c-C-F0--var-backend.in
index e81117f5..e81117f5 100644
--- a/test/cases/rlhc.d/case/conderr2.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/conderr2.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/conderr2.c-C-F1--goto-backend.exp b/test/rlhc.d/case/conderr2.c-C-F1--goto-backend.exp
index 452e5341..452e5341 100644
--- a/test/cases/rlhc.d/case/conderr2.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/conderr2.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/conderr2.c-C-F1--goto-backend.in b/test/rlhc.d/case/conderr2.c-C-F1--goto-backend.in
index d21210cb..d21210cb 100644
--- a/test/cases/rlhc.d/case/conderr2.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/conderr2.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/conderr2.c-C-F1--var-backend.exp b/test/rlhc.d/case/conderr2.c-C-F1--var-backend.exp
index c29b7c65..c29b7c65 100644
--- a/test/cases/rlhc.d/case/conderr2.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/conderr2.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/conderr2.c-C-F1--var-backend.in b/test/rlhc.d/case/conderr2.c-C-F1--var-backend.in
index 9548e25f..9548e25f 100644
--- a/test/cases/rlhc.d/case/conderr2.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/conderr2.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/conderr2.c-C-G0--goto-backend.exp b/test/rlhc.d/case/conderr2.c-C-G0--goto-backend.exp
index cbb9f0f5..cbb9f0f5 100644
--- a/test/cases/rlhc.d/case/conderr2.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/conderr2.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/conderr2.c-C-G0--goto-backend.in b/test/rlhc.d/case/conderr2.c-C-G0--goto-backend.in
index 872c775c..872c775c 100644
--- a/test/cases/rlhc.d/case/conderr2.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/conderr2.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/conderr2.c-C-G1--goto-backend.exp b/test/rlhc.d/case/conderr2.c-C-G1--goto-backend.exp
index 8d860645..8d860645 100644
--- a/test/cases/rlhc.d/case/conderr2.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/conderr2.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/conderr2.c-C-G1--goto-backend.in b/test/rlhc.d/case/conderr2.c-C-G1--goto-backend.in
index c7b4c8bd..c7b4c8bd 100644
--- a/test/cases/rlhc.d/case/conderr2.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/conderr2.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/conderr2.c-C-G2--goto-backend.exp b/test/rlhc.d/case/conderr2.c-C-G2--goto-backend.exp
index 65e215cd..65e215cd 100644
--- a/test/cases/rlhc.d/case/conderr2.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/conderr2.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/conderr2.c-C-G2--goto-backend.in b/test/rlhc.d/case/conderr2.c-C-G2--goto-backend.in
index 0c5dfcfe..0c5dfcfe 100644
--- a/test/cases/rlhc.d/case/conderr2.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/conderr2.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/conderr2.c-C-T0--goto-backend.exp b/test/rlhc.d/case/conderr2.c-C-T0--goto-backend.exp
index 2757f1fc..2757f1fc 100644
--- a/test/cases/rlhc.d/case/conderr2.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/conderr2.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/conderr2.c-C-T0--goto-backend.in b/test/rlhc.d/case/conderr2.c-C-T0--goto-backend.in
index 4b185c0e..4b185c0e 100644
--- a/test/cases/rlhc.d/case/conderr2.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/conderr2.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/conderr2.c-C-T0--var-backend.exp b/test/rlhc.d/case/conderr2.c-C-T0--var-backend.exp
index e00059d6..e00059d6 100644
--- a/test/cases/rlhc.d/case/conderr2.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/conderr2.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/conderr2.c-C-T0--var-backend.in b/test/rlhc.d/case/conderr2.c-C-T0--var-backend.in
index e9617d34..e9617d34 100644
--- a/test/cases/rlhc.d/case/conderr2.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/conderr2.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/conderr2.c-C-T1--goto-backend.exp b/test/rlhc.d/case/conderr2.c-C-T1--goto-backend.exp
index bc85174f..bc85174f 100644
--- a/test/cases/rlhc.d/case/conderr2.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/conderr2.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/conderr2.c-C-T1--goto-backend.in b/test/rlhc.d/case/conderr2.c-C-T1--goto-backend.in
index 4729c649..4729c649 100644
--- a/test/cases/rlhc.d/case/conderr2.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/conderr2.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/conderr2.c-C-T1--var-backend.exp b/test/rlhc.d/case/conderr2.c-C-T1--var-backend.exp
index ad39fa5b..ad39fa5b 100644
--- a/test/cases/rlhc.d/case/conderr2.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/conderr2.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/conderr2.c-C-T1--var-backend.in b/test/rlhc.d/case/conderr2.c-C-T1--var-backend.in
index ebc99eca..ebc99eca 100644
--- a/test/cases/rlhc.d/case/conderr2.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/conderr2.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/condrep1.cpp-C-F0--goto-backend.exp b/test/rlhc.d/case/condrep1.cpp-C-F0--goto-backend.exp
index fb9a3073..fb9a3073 100644
--- a/test/cases/rlhc.d/case/condrep1.cpp-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/condrep1.cpp-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep1.cpp-C-F0--goto-backend.in b/test/rlhc.d/case/condrep1.cpp-C-F0--goto-backend.in
index fd1aced6..fd1aced6 100644
--- a/test/cases/rlhc.d/case/condrep1.cpp-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/condrep1.cpp-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/condrep1.cpp-C-F0--var-backend.exp b/test/rlhc.d/case/condrep1.cpp-C-F0--var-backend.exp
index e759af63..e759af63 100644
--- a/test/cases/rlhc.d/case/condrep1.cpp-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/condrep1.cpp-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep1.cpp-C-F0--var-backend.in b/test/rlhc.d/case/condrep1.cpp-C-F0--var-backend.in
index 9bb2c1e5..9bb2c1e5 100644
--- a/test/cases/rlhc.d/case/condrep1.cpp-C-F0--var-backend.in
+++ b/test/rlhc.d/case/condrep1.cpp-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/condrep1.cpp-C-F1--goto-backend.exp b/test/rlhc.d/case/condrep1.cpp-C-F1--goto-backend.exp
index 2a13874b..2a13874b 100644
--- a/test/cases/rlhc.d/case/condrep1.cpp-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/condrep1.cpp-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep1.cpp-C-F1--goto-backend.in b/test/rlhc.d/case/condrep1.cpp-C-F1--goto-backend.in
index 727dcedf..727dcedf 100644
--- a/test/cases/rlhc.d/case/condrep1.cpp-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/condrep1.cpp-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/condrep1.cpp-C-F1--var-backend.exp b/test/rlhc.d/case/condrep1.cpp-C-F1--var-backend.exp
index 67d37d0d..67d37d0d 100644
--- a/test/cases/rlhc.d/case/condrep1.cpp-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/condrep1.cpp-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep1.cpp-C-F1--var-backend.in b/test/rlhc.d/case/condrep1.cpp-C-F1--var-backend.in
index cb95f692..cb95f692 100644
--- a/test/cases/rlhc.d/case/condrep1.cpp-C-F1--var-backend.in
+++ b/test/rlhc.d/case/condrep1.cpp-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/condrep1.cpp-C-G0--goto-backend.exp b/test/rlhc.d/case/condrep1.cpp-C-G0--goto-backend.exp
index c2af40a9..c2af40a9 100644
--- a/test/cases/rlhc.d/case/condrep1.cpp-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/condrep1.cpp-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep1.cpp-C-G0--goto-backend.in b/test/rlhc.d/case/condrep1.cpp-C-G0--goto-backend.in
index 54057d59..54057d59 100644
--- a/test/cases/rlhc.d/case/condrep1.cpp-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/condrep1.cpp-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/condrep1.cpp-C-G1--goto-backend.exp b/test/rlhc.d/case/condrep1.cpp-C-G1--goto-backend.exp
index 211eda2d..211eda2d 100644
--- a/test/cases/rlhc.d/case/condrep1.cpp-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/condrep1.cpp-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep1.cpp-C-G1--goto-backend.in b/test/rlhc.d/case/condrep1.cpp-C-G1--goto-backend.in
index e27a4b05..e27a4b05 100644
--- a/test/cases/rlhc.d/case/condrep1.cpp-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/condrep1.cpp-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/condrep1.cpp-C-G2--goto-backend.exp b/test/rlhc.d/case/condrep1.cpp-C-G2--goto-backend.exp
index 5f543069..5f543069 100644
--- a/test/cases/rlhc.d/case/condrep1.cpp-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/condrep1.cpp-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep1.cpp-C-G2--goto-backend.in b/test/rlhc.d/case/condrep1.cpp-C-G2--goto-backend.in
index 2290f4cb..2290f4cb 100644
--- a/test/cases/rlhc.d/case/condrep1.cpp-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/condrep1.cpp-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/condrep1.cpp-C-T0--goto-backend.exp b/test/rlhc.d/case/condrep1.cpp-C-T0--goto-backend.exp
index b103ad95..b103ad95 100644
--- a/test/cases/rlhc.d/case/condrep1.cpp-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/condrep1.cpp-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep1.cpp-C-T0--goto-backend.in b/test/rlhc.d/case/condrep1.cpp-C-T0--goto-backend.in
index df79aaca..df79aaca 100644
--- a/test/cases/rlhc.d/case/condrep1.cpp-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/condrep1.cpp-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/condrep1.cpp-C-T0--var-backend.exp b/test/rlhc.d/case/condrep1.cpp-C-T0--var-backend.exp
index f96926eb..f96926eb 100644
--- a/test/cases/rlhc.d/case/condrep1.cpp-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/condrep1.cpp-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep1.cpp-C-T0--var-backend.in b/test/rlhc.d/case/condrep1.cpp-C-T0--var-backend.in
index 2e8da38e..2e8da38e 100644
--- a/test/cases/rlhc.d/case/condrep1.cpp-C-T0--var-backend.in
+++ b/test/rlhc.d/case/condrep1.cpp-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/condrep1.cpp-C-T1--goto-backend.exp b/test/rlhc.d/case/condrep1.cpp-C-T1--goto-backend.exp
index 5754c782..5754c782 100644
--- a/test/cases/rlhc.d/case/condrep1.cpp-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/condrep1.cpp-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep1.cpp-C-T1--goto-backend.in b/test/rlhc.d/case/condrep1.cpp-C-T1--goto-backend.in
index 742e252f..742e252f 100644
--- a/test/cases/rlhc.d/case/condrep1.cpp-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/condrep1.cpp-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/condrep1.cpp-C-T1--var-backend.exp b/test/rlhc.d/case/condrep1.cpp-C-T1--var-backend.exp
index a0d43688..a0d43688 100644
--- a/test/cases/rlhc.d/case/condrep1.cpp-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/condrep1.cpp-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep1.cpp-C-T1--var-backend.in b/test/rlhc.d/case/condrep1.cpp-C-T1--var-backend.in
index b006415f..b006415f 100644
--- a/test/cases/rlhc.d/case/condrep1.cpp-C-T1--var-backend.in
+++ b/test/rlhc.d/case/condrep1.cpp-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/condrep2.cpp-C-F0--goto-backend.exp b/test/rlhc.d/case/condrep2.cpp-C-F0--goto-backend.exp
index f91b190c..f91b190c 100644
--- a/test/cases/rlhc.d/case/condrep2.cpp-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/condrep2.cpp-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep2.cpp-C-F0--goto-backend.in b/test/rlhc.d/case/condrep2.cpp-C-F0--goto-backend.in
index e6bc508b..e6bc508b 100644
--- a/test/cases/rlhc.d/case/condrep2.cpp-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/condrep2.cpp-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/condrep2.cpp-C-F0--var-backend.exp b/test/rlhc.d/case/condrep2.cpp-C-F0--var-backend.exp
index cff5b38e..cff5b38e 100644
--- a/test/cases/rlhc.d/case/condrep2.cpp-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/condrep2.cpp-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep2.cpp-C-F0--var-backend.in b/test/rlhc.d/case/condrep2.cpp-C-F0--var-backend.in
index 964b7f32..964b7f32 100644
--- a/test/cases/rlhc.d/case/condrep2.cpp-C-F0--var-backend.in
+++ b/test/rlhc.d/case/condrep2.cpp-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/condrep2.cpp-C-F1--goto-backend.exp b/test/rlhc.d/case/condrep2.cpp-C-F1--goto-backend.exp
index a52d5a4c..a52d5a4c 100644
--- a/test/cases/rlhc.d/case/condrep2.cpp-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/condrep2.cpp-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep2.cpp-C-F1--goto-backend.in b/test/rlhc.d/case/condrep2.cpp-C-F1--goto-backend.in
index 16366b02..16366b02 100644
--- a/test/cases/rlhc.d/case/condrep2.cpp-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/condrep2.cpp-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/condrep2.cpp-C-F1--var-backend.exp b/test/rlhc.d/case/condrep2.cpp-C-F1--var-backend.exp
index db680cca..db680cca 100644
--- a/test/cases/rlhc.d/case/condrep2.cpp-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/condrep2.cpp-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep2.cpp-C-F1--var-backend.in b/test/rlhc.d/case/condrep2.cpp-C-F1--var-backend.in
index 9b5a17aa..9b5a17aa 100644
--- a/test/cases/rlhc.d/case/condrep2.cpp-C-F1--var-backend.in
+++ b/test/rlhc.d/case/condrep2.cpp-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/condrep2.cpp-C-G0--goto-backend.exp b/test/rlhc.d/case/condrep2.cpp-C-G0--goto-backend.exp
index 4d7d5eb2..4d7d5eb2 100644
--- a/test/cases/rlhc.d/case/condrep2.cpp-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/condrep2.cpp-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep2.cpp-C-G0--goto-backend.in b/test/rlhc.d/case/condrep2.cpp-C-G0--goto-backend.in
index 03861db4..03861db4 100644
--- a/test/cases/rlhc.d/case/condrep2.cpp-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/condrep2.cpp-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/condrep2.cpp-C-G1--goto-backend.exp b/test/rlhc.d/case/condrep2.cpp-C-G1--goto-backend.exp
index 376c8c13..376c8c13 100644
--- a/test/cases/rlhc.d/case/condrep2.cpp-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/condrep2.cpp-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep2.cpp-C-G1--goto-backend.in b/test/rlhc.d/case/condrep2.cpp-C-G1--goto-backend.in
index aad15187..aad15187 100644
--- a/test/cases/rlhc.d/case/condrep2.cpp-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/condrep2.cpp-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/condrep2.cpp-C-G2--goto-backend.exp b/test/rlhc.d/case/condrep2.cpp-C-G2--goto-backend.exp
index d35daa8c..d35daa8c 100644
--- a/test/cases/rlhc.d/case/condrep2.cpp-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/condrep2.cpp-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep2.cpp-C-G2--goto-backend.in b/test/rlhc.d/case/condrep2.cpp-C-G2--goto-backend.in
index 9fc62167..9fc62167 100644
--- a/test/cases/rlhc.d/case/condrep2.cpp-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/condrep2.cpp-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/condrep2.cpp-C-T0--goto-backend.exp b/test/rlhc.d/case/condrep2.cpp-C-T0--goto-backend.exp
index a4e8d942..a4e8d942 100644
--- a/test/cases/rlhc.d/case/condrep2.cpp-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/condrep2.cpp-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep2.cpp-C-T0--goto-backend.in b/test/rlhc.d/case/condrep2.cpp-C-T0--goto-backend.in
index 3bbf6aef..3bbf6aef 100644
--- a/test/cases/rlhc.d/case/condrep2.cpp-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/condrep2.cpp-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/condrep2.cpp-C-T0--var-backend.exp b/test/rlhc.d/case/condrep2.cpp-C-T0--var-backend.exp
index 161f5742..161f5742 100644
--- a/test/cases/rlhc.d/case/condrep2.cpp-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/condrep2.cpp-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep2.cpp-C-T0--var-backend.in b/test/rlhc.d/case/condrep2.cpp-C-T0--var-backend.in
index 7cc01d5c..7cc01d5c 100644
--- a/test/cases/rlhc.d/case/condrep2.cpp-C-T0--var-backend.in
+++ b/test/rlhc.d/case/condrep2.cpp-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/condrep2.cpp-C-T1--goto-backend.exp b/test/rlhc.d/case/condrep2.cpp-C-T1--goto-backend.exp
index f8c52bde..f8c52bde 100644
--- a/test/cases/rlhc.d/case/condrep2.cpp-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/condrep2.cpp-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep2.cpp-C-T1--goto-backend.in b/test/rlhc.d/case/condrep2.cpp-C-T1--goto-backend.in
index 9aa308d5..9aa308d5 100644
--- a/test/cases/rlhc.d/case/condrep2.cpp-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/condrep2.cpp-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/condrep2.cpp-C-T1--var-backend.exp b/test/rlhc.d/case/condrep2.cpp-C-T1--var-backend.exp
index 7d267cf1..7d267cf1 100644
--- a/test/cases/rlhc.d/case/condrep2.cpp-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/condrep2.cpp-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep2.cpp-C-T1--var-backend.in b/test/rlhc.d/case/condrep2.cpp-C-T1--var-backend.in
index 96ea97cc..96ea97cc 100644
--- a/test/cases/rlhc.d/case/condrep2.cpp-C-T1--var-backend.in
+++ b/test/rlhc.d/case/condrep2.cpp-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/condrep3.cpp-C-F0--goto-backend.exp b/test/rlhc.d/case/condrep3.cpp-C-F0--goto-backend.exp
index d9948eb6..d9948eb6 100644
--- a/test/cases/rlhc.d/case/condrep3.cpp-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/condrep3.cpp-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep3.cpp-C-F0--goto-backend.in b/test/rlhc.d/case/condrep3.cpp-C-F0--goto-backend.in
index 63fa5d32..63fa5d32 100644
--- a/test/cases/rlhc.d/case/condrep3.cpp-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/condrep3.cpp-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/condrep3.cpp-C-F0--var-backend.exp b/test/rlhc.d/case/condrep3.cpp-C-F0--var-backend.exp
index bdf99783..bdf99783 100644
--- a/test/cases/rlhc.d/case/condrep3.cpp-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/condrep3.cpp-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep3.cpp-C-F0--var-backend.in b/test/rlhc.d/case/condrep3.cpp-C-F0--var-backend.in
index f0dad171..f0dad171 100644
--- a/test/cases/rlhc.d/case/condrep3.cpp-C-F0--var-backend.in
+++ b/test/rlhc.d/case/condrep3.cpp-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/condrep3.cpp-C-F1--goto-backend.exp b/test/rlhc.d/case/condrep3.cpp-C-F1--goto-backend.exp
index a19f3c14..a19f3c14 100644
--- a/test/cases/rlhc.d/case/condrep3.cpp-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/condrep3.cpp-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep3.cpp-C-F1--goto-backend.in b/test/rlhc.d/case/condrep3.cpp-C-F1--goto-backend.in
index 54aa0988..54aa0988 100644
--- a/test/cases/rlhc.d/case/condrep3.cpp-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/condrep3.cpp-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/condrep3.cpp-C-F1--var-backend.exp b/test/rlhc.d/case/condrep3.cpp-C-F1--var-backend.exp
index a11f407b..a11f407b 100644
--- a/test/cases/rlhc.d/case/condrep3.cpp-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/condrep3.cpp-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep3.cpp-C-F1--var-backend.in b/test/rlhc.d/case/condrep3.cpp-C-F1--var-backend.in
index aa31900a..aa31900a 100644
--- a/test/cases/rlhc.d/case/condrep3.cpp-C-F1--var-backend.in
+++ b/test/rlhc.d/case/condrep3.cpp-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/condrep3.cpp-C-G0--goto-backend.exp b/test/rlhc.d/case/condrep3.cpp-C-G0--goto-backend.exp
index 59283d18..59283d18 100644
--- a/test/cases/rlhc.d/case/condrep3.cpp-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/condrep3.cpp-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep3.cpp-C-G0--goto-backend.in b/test/rlhc.d/case/condrep3.cpp-C-G0--goto-backend.in
index 8bd3a560..8bd3a560 100644
--- a/test/cases/rlhc.d/case/condrep3.cpp-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/condrep3.cpp-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/condrep3.cpp-C-G1--goto-backend.exp b/test/rlhc.d/case/condrep3.cpp-C-G1--goto-backend.exp
index 3618cc75..3618cc75 100644
--- a/test/cases/rlhc.d/case/condrep3.cpp-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/condrep3.cpp-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep3.cpp-C-G1--goto-backend.in b/test/rlhc.d/case/condrep3.cpp-C-G1--goto-backend.in
index 1c45864f..1c45864f 100644
--- a/test/cases/rlhc.d/case/condrep3.cpp-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/condrep3.cpp-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/condrep3.cpp-C-G2--goto-backend.exp b/test/rlhc.d/case/condrep3.cpp-C-G2--goto-backend.exp
index 1716ee6d..1716ee6d 100644
--- a/test/cases/rlhc.d/case/condrep3.cpp-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/condrep3.cpp-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep3.cpp-C-G2--goto-backend.in b/test/rlhc.d/case/condrep3.cpp-C-G2--goto-backend.in
index d75f2127..d75f2127 100644
--- a/test/cases/rlhc.d/case/condrep3.cpp-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/condrep3.cpp-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/condrep3.cpp-C-T0--goto-backend.exp b/test/rlhc.d/case/condrep3.cpp-C-T0--goto-backend.exp
index ab18a254..ab18a254 100644
--- a/test/cases/rlhc.d/case/condrep3.cpp-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/condrep3.cpp-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep3.cpp-C-T0--goto-backend.in b/test/rlhc.d/case/condrep3.cpp-C-T0--goto-backend.in
index 93b6915a..93b6915a 100644
--- a/test/cases/rlhc.d/case/condrep3.cpp-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/condrep3.cpp-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/condrep3.cpp-C-T0--var-backend.exp b/test/rlhc.d/case/condrep3.cpp-C-T0--var-backend.exp
index d269898a..d269898a 100644
--- a/test/cases/rlhc.d/case/condrep3.cpp-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/condrep3.cpp-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep3.cpp-C-T0--var-backend.in b/test/rlhc.d/case/condrep3.cpp-C-T0--var-backend.in
index d7fdf9a5..d7fdf9a5 100644
--- a/test/cases/rlhc.d/case/condrep3.cpp-C-T0--var-backend.in
+++ b/test/rlhc.d/case/condrep3.cpp-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/condrep3.cpp-C-T1--goto-backend.exp b/test/rlhc.d/case/condrep3.cpp-C-T1--goto-backend.exp
index b64c084f..b64c084f 100644
--- a/test/cases/rlhc.d/case/condrep3.cpp-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/condrep3.cpp-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep3.cpp-C-T1--goto-backend.in b/test/rlhc.d/case/condrep3.cpp-C-T1--goto-backend.in
index 89daf60d..89daf60d 100644
--- a/test/cases/rlhc.d/case/condrep3.cpp-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/condrep3.cpp-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/condrep3.cpp-C-T1--var-backend.exp b/test/rlhc.d/case/condrep3.cpp-C-T1--var-backend.exp
index 0608f27b..0608f27b 100644
--- a/test/cases/rlhc.d/case/condrep3.cpp-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/condrep3.cpp-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep3.cpp-C-T1--var-backend.in b/test/rlhc.d/case/condrep3.cpp-C-T1--var-backend.in
index 64b303ea..64b303ea 100644
--- a/test/cases/rlhc.d/case/condrep3.cpp-C-T1--var-backend.in
+++ b/test/rlhc.d/case/condrep3.cpp-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/condrep4.cpp-C-F0--goto-backend.exp b/test/rlhc.d/case/condrep4.cpp-C-F0--goto-backend.exp
index 200191a9..200191a9 100644
--- a/test/cases/rlhc.d/case/condrep4.cpp-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/condrep4.cpp-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep4.cpp-C-F0--goto-backend.in b/test/rlhc.d/case/condrep4.cpp-C-F0--goto-backend.in
index 8601045e..8601045e 100644
--- a/test/cases/rlhc.d/case/condrep4.cpp-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/condrep4.cpp-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/condrep4.cpp-C-F0--var-backend.exp b/test/rlhc.d/case/condrep4.cpp-C-F0--var-backend.exp
index d7549746..d7549746 100644
--- a/test/cases/rlhc.d/case/condrep4.cpp-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/condrep4.cpp-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep4.cpp-C-F0--var-backend.in b/test/rlhc.d/case/condrep4.cpp-C-F0--var-backend.in
index 3d3e7b4b..3d3e7b4b 100644
--- a/test/cases/rlhc.d/case/condrep4.cpp-C-F0--var-backend.in
+++ b/test/rlhc.d/case/condrep4.cpp-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/condrep4.cpp-C-F1--goto-backend.exp b/test/rlhc.d/case/condrep4.cpp-C-F1--goto-backend.exp
index e8eedf20..e8eedf20 100644
--- a/test/cases/rlhc.d/case/condrep4.cpp-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/condrep4.cpp-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep4.cpp-C-F1--goto-backend.in b/test/rlhc.d/case/condrep4.cpp-C-F1--goto-backend.in
index 05e7e528..05e7e528 100644
--- a/test/cases/rlhc.d/case/condrep4.cpp-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/condrep4.cpp-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/condrep4.cpp-C-F1--var-backend.exp b/test/rlhc.d/case/condrep4.cpp-C-F1--var-backend.exp
index 135851eb..135851eb 100644
--- a/test/cases/rlhc.d/case/condrep4.cpp-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/condrep4.cpp-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep4.cpp-C-F1--var-backend.in b/test/rlhc.d/case/condrep4.cpp-C-F1--var-backend.in
index ad29a104..ad29a104 100644
--- a/test/cases/rlhc.d/case/condrep4.cpp-C-F1--var-backend.in
+++ b/test/rlhc.d/case/condrep4.cpp-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/condrep4.cpp-C-G0--goto-backend.exp b/test/rlhc.d/case/condrep4.cpp-C-G0--goto-backend.exp
index ac0cd46c..ac0cd46c 100644
--- a/test/cases/rlhc.d/case/condrep4.cpp-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/condrep4.cpp-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep4.cpp-C-G0--goto-backend.in b/test/rlhc.d/case/condrep4.cpp-C-G0--goto-backend.in
index ad678860..ad678860 100644
--- a/test/cases/rlhc.d/case/condrep4.cpp-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/condrep4.cpp-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/condrep4.cpp-C-G1--goto-backend.exp b/test/rlhc.d/case/condrep4.cpp-C-G1--goto-backend.exp
index 84717f50..84717f50 100644
--- a/test/cases/rlhc.d/case/condrep4.cpp-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/condrep4.cpp-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep4.cpp-C-G1--goto-backend.in b/test/rlhc.d/case/condrep4.cpp-C-G1--goto-backend.in
index c6add060..c6add060 100644
--- a/test/cases/rlhc.d/case/condrep4.cpp-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/condrep4.cpp-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/condrep4.cpp-C-G2--goto-backend.exp b/test/rlhc.d/case/condrep4.cpp-C-G2--goto-backend.exp
index 0fc131d1..0fc131d1 100644
--- a/test/cases/rlhc.d/case/condrep4.cpp-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/condrep4.cpp-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep4.cpp-C-G2--goto-backend.in b/test/rlhc.d/case/condrep4.cpp-C-G2--goto-backend.in
index 0a349648..0a349648 100644
--- a/test/cases/rlhc.d/case/condrep4.cpp-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/condrep4.cpp-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/condrep4.cpp-C-T0--goto-backend.exp b/test/rlhc.d/case/condrep4.cpp-C-T0--goto-backend.exp
index 3a597383..3a597383 100644
--- a/test/cases/rlhc.d/case/condrep4.cpp-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/condrep4.cpp-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep4.cpp-C-T0--goto-backend.in b/test/rlhc.d/case/condrep4.cpp-C-T0--goto-backend.in
index 3d40522b..3d40522b 100644
--- a/test/cases/rlhc.d/case/condrep4.cpp-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/condrep4.cpp-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/condrep4.cpp-C-T0--var-backend.exp b/test/rlhc.d/case/condrep4.cpp-C-T0--var-backend.exp
index 20c04eab..20c04eab 100644
--- a/test/cases/rlhc.d/case/condrep4.cpp-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/condrep4.cpp-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep4.cpp-C-T0--var-backend.in b/test/rlhc.d/case/condrep4.cpp-C-T0--var-backend.in
index 8e741c85..8e741c85 100644
--- a/test/cases/rlhc.d/case/condrep4.cpp-C-T0--var-backend.in
+++ b/test/rlhc.d/case/condrep4.cpp-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/condrep4.cpp-C-T1--goto-backend.exp b/test/rlhc.d/case/condrep4.cpp-C-T1--goto-backend.exp
index ca96bd70..ca96bd70 100644
--- a/test/cases/rlhc.d/case/condrep4.cpp-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/condrep4.cpp-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep4.cpp-C-T1--goto-backend.in b/test/rlhc.d/case/condrep4.cpp-C-T1--goto-backend.in
index 6aea1710..6aea1710 100644
--- a/test/cases/rlhc.d/case/condrep4.cpp-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/condrep4.cpp-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/condrep4.cpp-C-T1--var-backend.exp b/test/rlhc.d/case/condrep4.cpp-C-T1--var-backend.exp
index 6acf2886..6acf2886 100644
--- a/test/cases/rlhc.d/case/condrep4.cpp-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/condrep4.cpp-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/condrep4.cpp-C-T1--var-backend.in b/test/rlhc.d/case/condrep4.cpp-C-T1--var-backend.in
index 52c9b9e3..52c9b9e3 100644
--- a/test/cases/rlhc.d/case/condrep4.cpp-C-T1--var-backend.in
+++ b/test/rlhc.d/case/condrep4.cpp-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan1.cpp-C-F0--goto-backend.exp b/test/rlhc.d/case/cppscan1.cpp-C-F0--goto-backend.exp
index 6f779905..6f779905 100644
--- a/test/cases/rlhc.d/case/cppscan1.cpp-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan1.cpp-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan1.cpp-C-F0--goto-backend.in b/test/rlhc.d/case/cppscan1.cpp-C-F0--goto-backend.in
index 2c2ae61f..2c2ae61f 100644
--- a/test/cases/rlhc.d/case/cppscan1.cpp-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/cppscan1.cpp-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan1.cpp-C-F0--var-backend.exp b/test/rlhc.d/case/cppscan1.cpp-C-F0--var-backend.exp
index e579d601..e579d601 100644
--- a/test/cases/rlhc.d/case/cppscan1.cpp-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/cppscan1.cpp-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan1.cpp-C-F0--var-backend.in b/test/rlhc.d/case/cppscan1.cpp-C-F0--var-backend.in
index 8755efd8..8755efd8 100644
--- a/test/cases/rlhc.d/case/cppscan1.cpp-C-F0--var-backend.in
+++ b/test/rlhc.d/case/cppscan1.cpp-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan1.cpp-C-F1--goto-backend.exp b/test/rlhc.d/case/cppscan1.cpp-C-F1--goto-backend.exp
index 7b656dd3..7b656dd3 100644
--- a/test/cases/rlhc.d/case/cppscan1.cpp-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan1.cpp-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan1.cpp-C-F1--goto-backend.in b/test/rlhc.d/case/cppscan1.cpp-C-F1--goto-backend.in
index e99e58ea..e99e58ea 100644
--- a/test/cases/rlhc.d/case/cppscan1.cpp-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/cppscan1.cpp-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan1.cpp-C-F1--var-backend.exp b/test/rlhc.d/case/cppscan1.cpp-C-F1--var-backend.exp
index 4c0e603a..4c0e603a 100644
--- a/test/cases/rlhc.d/case/cppscan1.cpp-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/cppscan1.cpp-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan1.cpp-C-F1--var-backend.in b/test/rlhc.d/case/cppscan1.cpp-C-F1--var-backend.in
index b1a0740c..b1a0740c 100644
--- a/test/cases/rlhc.d/case/cppscan1.cpp-C-F1--var-backend.in
+++ b/test/rlhc.d/case/cppscan1.cpp-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan1.cpp-C-G0--goto-backend.exp b/test/rlhc.d/case/cppscan1.cpp-C-G0--goto-backend.exp
index 6c3a7fcd..6c3a7fcd 100644
--- a/test/cases/rlhc.d/case/cppscan1.cpp-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan1.cpp-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan1.cpp-C-G0--goto-backend.in b/test/rlhc.d/case/cppscan1.cpp-C-G0--goto-backend.in
index 9e768f7c..9e768f7c 100644
--- a/test/cases/rlhc.d/case/cppscan1.cpp-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/cppscan1.cpp-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan1.cpp-C-G1--goto-backend.exp b/test/rlhc.d/case/cppscan1.cpp-C-G1--goto-backend.exp
index 52ff5eed..52ff5eed 100644
--- a/test/cases/rlhc.d/case/cppscan1.cpp-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan1.cpp-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan1.cpp-C-G1--goto-backend.in b/test/rlhc.d/case/cppscan1.cpp-C-G1--goto-backend.in
index 69ea08f0..69ea08f0 100644
--- a/test/cases/rlhc.d/case/cppscan1.cpp-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/cppscan1.cpp-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan1.cpp-C-G2--goto-backend.exp b/test/rlhc.d/case/cppscan1.cpp-C-G2--goto-backend.exp
index 486e623d..486e623d 100644
--- a/test/cases/rlhc.d/case/cppscan1.cpp-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan1.cpp-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan1.cpp-C-G2--goto-backend.in b/test/rlhc.d/case/cppscan1.cpp-C-G2--goto-backend.in
index a33d451a..a33d451a 100644
--- a/test/cases/rlhc.d/case/cppscan1.cpp-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/cppscan1.cpp-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan1.cpp-C-T0--goto-backend.exp b/test/rlhc.d/case/cppscan1.cpp-C-T0--goto-backend.exp
index 5e07a912..5e07a912 100644
--- a/test/cases/rlhc.d/case/cppscan1.cpp-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan1.cpp-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan1.cpp-C-T0--goto-backend.in b/test/rlhc.d/case/cppscan1.cpp-C-T0--goto-backend.in
index fd610a67..fd610a67 100644
--- a/test/cases/rlhc.d/case/cppscan1.cpp-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/cppscan1.cpp-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan1.cpp-C-T0--var-backend.exp b/test/rlhc.d/case/cppscan1.cpp-C-T0--var-backend.exp
index 8ed36fe8..8ed36fe8 100644
--- a/test/cases/rlhc.d/case/cppscan1.cpp-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/cppscan1.cpp-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan1.cpp-C-T0--var-backend.in b/test/rlhc.d/case/cppscan1.cpp-C-T0--var-backend.in
index 3db7c99f..3db7c99f 100644
--- a/test/cases/rlhc.d/case/cppscan1.cpp-C-T0--var-backend.in
+++ b/test/rlhc.d/case/cppscan1.cpp-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan1.cpp-C-T1--goto-backend.exp b/test/rlhc.d/case/cppscan1.cpp-C-T1--goto-backend.exp
index b8ccee09..b8ccee09 100644
--- a/test/cases/rlhc.d/case/cppscan1.cpp-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan1.cpp-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan1.cpp-C-T1--goto-backend.in b/test/rlhc.d/case/cppscan1.cpp-C-T1--goto-backend.in
index b5b400c5..b5b400c5 100644
--- a/test/cases/rlhc.d/case/cppscan1.cpp-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/cppscan1.cpp-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan1.cpp-C-T1--var-backend.exp b/test/rlhc.d/case/cppscan1.cpp-C-T1--var-backend.exp
index 966b29ea..966b29ea 100644
--- a/test/cases/rlhc.d/case/cppscan1.cpp-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/cppscan1.cpp-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan1.cpp-C-T1--var-backend.in b/test/rlhc.d/case/cppscan1.cpp-C-T1--var-backend.in
index 6876fbb1..6876fbb1 100644
--- a/test/cases/rlhc.d/case/cppscan1.cpp-C-T1--var-backend.in
+++ b/test/rlhc.d/case/cppscan1.cpp-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan2.cpp-C-F0--goto-backend.exp b/test/rlhc.d/case/cppscan2.cpp-C-F0--goto-backend.exp
index 3c67bd4f..3c67bd4f 100644
--- a/test/cases/rlhc.d/case/cppscan2.cpp-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan2.cpp-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan2.cpp-C-F0--goto-backend.in b/test/rlhc.d/case/cppscan2.cpp-C-F0--goto-backend.in
index 0b554f8b..0b554f8b 100644
--- a/test/cases/rlhc.d/case/cppscan2.cpp-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/cppscan2.cpp-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan2.cpp-C-F0--var-backend.exp b/test/rlhc.d/case/cppscan2.cpp-C-F0--var-backend.exp
index 689c5ec7..689c5ec7 100644
--- a/test/cases/rlhc.d/case/cppscan2.cpp-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/cppscan2.cpp-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan2.cpp-C-F0--var-backend.in b/test/rlhc.d/case/cppscan2.cpp-C-F0--var-backend.in
index ac53cc06..ac53cc06 100644
--- a/test/cases/rlhc.d/case/cppscan2.cpp-C-F0--var-backend.in
+++ b/test/rlhc.d/case/cppscan2.cpp-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan2.cpp-C-F1--goto-backend.exp b/test/rlhc.d/case/cppscan2.cpp-C-F1--goto-backend.exp
index d7f55c7f..d7f55c7f 100644
--- a/test/cases/rlhc.d/case/cppscan2.cpp-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan2.cpp-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan2.cpp-C-F1--goto-backend.in b/test/rlhc.d/case/cppscan2.cpp-C-F1--goto-backend.in
index 7541f9ed..7541f9ed 100644
--- a/test/cases/rlhc.d/case/cppscan2.cpp-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/cppscan2.cpp-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan2.cpp-C-F1--var-backend.exp b/test/rlhc.d/case/cppscan2.cpp-C-F1--var-backend.exp
index d63b3593..d63b3593 100644
--- a/test/cases/rlhc.d/case/cppscan2.cpp-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/cppscan2.cpp-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan2.cpp-C-F1--var-backend.in b/test/rlhc.d/case/cppscan2.cpp-C-F1--var-backend.in
index 4e72b8ed..4e72b8ed 100644
--- a/test/cases/rlhc.d/case/cppscan2.cpp-C-F1--var-backend.in
+++ b/test/rlhc.d/case/cppscan2.cpp-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan2.cpp-C-G0--goto-backend.exp b/test/rlhc.d/case/cppscan2.cpp-C-G0--goto-backend.exp
index 34d46467..34d46467 100644
--- a/test/cases/rlhc.d/case/cppscan2.cpp-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan2.cpp-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan2.cpp-C-G0--goto-backend.in b/test/rlhc.d/case/cppscan2.cpp-C-G0--goto-backend.in
index c0f1df99..c0f1df99 100644
--- a/test/cases/rlhc.d/case/cppscan2.cpp-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/cppscan2.cpp-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan2.cpp-C-G1--goto-backend.exp b/test/rlhc.d/case/cppscan2.cpp-C-G1--goto-backend.exp
index 2b434957..2b434957 100644
--- a/test/cases/rlhc.d/case/cppscan2.cpp-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan2.cpp-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan2.cpp-C-G1--goto-backend.in b/test/rlhc.d/case/cppscan2.cpp-C-G1--goto-backend.in
index ec493c6e..ec493c6e 100644
--- a/test/cases/rlhc.d/case/cppscan2.cpp-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/cppscan2.cpp-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan2.cpp-C-G2--goto-backend.exp b/test/rlhc.d/case/cppscan2.cpp-C-G2--goto-backend.exp
index aa1cbe23..aa1cbe23 100644
--- a/test/cases/rlhc.d/case/cppscan2.cpp-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan2.cpp-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan2.cpp-C-G2--goto-backend.in b/test/rlhc.d/case/cppscan2.cpp-C-G2--goto-backend.in
index ed1bba7b..ed1bba7b 100644
--- a/test/cases/rlhc.d/case/cppscan2.cpp-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/cppscan2.cpp-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan2.cpp-C-T0--goto-backend.exp b/test/rlhc.d/case/cppscan2.cpp-C-T0--goto-backend.exp
index b1980685..b1980685 100644
--- a/test/cases/rlhc.d/case/cppscan2.cpp-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan2.cpp-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan2.cpp-C-T0--goto-backend.in b/test/rlhc.d/case/cppscan2.cpp-C-T0--goto-backend.in
index 6bcab2c5..6bcab2c5 100644
--- a/test/cases/rlhc.d/case/cppscan2.cpp-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/cppscan2.cpp-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan2.cpp-C-T0--var-backend.exp b/test/rlhc.d/case/cppscan2.cpp-C-T0--var-backend.exp
index d3cff706..d3cff706 100644
--- a/test/cases/rlhc.d/case/cppscan2.cpp-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/cppscan2.cpp-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan2.cpp-C-T0--var-backend.in b/test/rlhc.d/case/cppscan2.cpp-C-T0--var-backend.in
index 054ecbc7..054ecbc7 100644
--- a/test/cases/rlhc.d/case/cppscan2.cpp-C-T0--var-backend.in
+++ b/test/rlhc.d/case/cppscan2.cpp-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan2.cpp-C-T1--goto-backend.exp b/test/rlhc.d/case/cppscan2.cpp-C-T1--goto-backend.exp
index f1071f3d..f1071f3d 100644
--- a/test/cases/rlhc.d/case/cppscan2.cpp-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan2.cpp-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan2.cpp-C-T1--goto-backend.in b/test/rlhc.d/case/cppscan2.cpp-C-T1--goto-backend.in
index 8daafabe..8daafabe 100644
--- a/test/cases/rlhc.d/case/cppscan2.cpp-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/cppscan2.cpp-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan2.cpp-C-T1--var-backend.exp b/test/rlhc.d/case/cppscan2.cpp-C-T1--var-backend.exp
index 0bd19389..0bd19389 100644
--- a/test/cases/rlhc.d/case/cppscan2.cpp-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/cppscan2.cpp-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan2.cpp-C-T1--var-backend.in b/test/rlhc.d/case/cppscan2.cpp-C-T1--var-backend.in
index 3c4dc153..3c4dc153 100644
--- a/test/cases/rlhc.d/case/cppscan2.cpp-C-T1--var-backend.in
+++ b/test/rlhc.d/case/cppscan2.cpp-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan3.cpp-C-F0--goto-backend.exp b/test/rlhc.d/case/cppscan3.cpp-C-F0--goto-backend.exp
index 820506b6..820506b6 100644
--- a/test/cases/rlhc.d/case/cppscan3.cpp-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan3.cpp-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan3.cpp-C-F0--goto-backend.in b/test/rlhc.d/case/cppscan3.cpp-C-F0--goto-backend.in
index 024c1000..024c1000 100644
--- a/test/cases/rlhc.d/case/cppscan3.cpp-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/cppscan3.cpp-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan3.cpp-C-F0--var-backend.exp b/test/rlhc.d/case/cppscan3.cpp-C-F0--var-backend.exp
index b7c39845..b7c39845 100644
--- a/test/cases/rlhc.d/case/cppscan3.cpp-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/cppscan3.cpp-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan3.cpp-C-F0--var-backend.in b/test/rlhc.d/case/cppscan3.cpp-C-F0--var-backend.in
index 65885876..65885876 100644
--- a/test/cases/rlhc.d/case/cppscan3.cpp-C-F0--var-backend.in
+++ b/test/rlhc.d/case/cppscan3.cpp-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan3.cpp-C-F1--goto-backend.exp b/test/rlhc.d/case/cppscan3.cpp-C-F1--goto-backend.exp
index 49741b75..49741b75 100644
--- a/test/cases/rlhc.d/case/cppscan3.cpp-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan3.cpp-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan3.cpp-C-F1--goto-backend.in b/test/rlhc.d/case/cppscan3.cpp-C-F1--goto-backend.in
index 9c44f8f5..9c44f8f5 100644
--- a/test/cases/rlhc.d/case/cppscan3.cpp-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/cppscan3.cpp-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan3.cpp-C-F1--var-backend.exp b/test/rlhc.d/case/cppscan3.cpp-C-F1--var-backend.exp
index bbf0487e..bbf0487e 100644
--- a/test/cases/rlhc.d/case/cppscan3.cpp-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/cppscan3.cpp-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan3.cpp-C-F1--var-backend.in b/test/rlhc.d/case/cppscan3.cpp-C-F1--var-backend.in
index b6828f04..b6828f04 100644
--- a/test/cases/rlhc.d/case/cppscan3.cpp-C-F1--var-backend.in
+++ b/test/rlhc.d/case/cppscan3.cpp-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan3.cpp-C-G0--goto-backend.exp b/test/rlhc.d/case/cppscan3.cpp-C-G0--goto-backend.exp
index 14ed8936..14ed8936 100644
--- a/test/cases/rlhc.d/case/cppscan3.cpp-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan3.cpp-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan3.cpp-C-G0--goto-backend.in b/test/rlhc.d/case/cppscan3.cpp-C-G0--goto-backend.in
index 68932656..68932656 100644
--- a/test/cases/rlhc.d/case/cppscan3.cpp-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/cppscan3.cpp-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan3.cpp-C-G1--goto-backend.exp b/test/rlhc.d/case/cppscan3.cpp-C-G1--goto-backend.exp
index 85b37598..85b37598 100644
--- a/test/cases/rlhc.d/case/cppscan3.cpp-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan3.cpp-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan3.cpp-C-G1--goto-backend.in b/test/rlhc.d/case/cppscan3.cpp-C-G1--goto-backend.in
index e28c497b..e28c497b 100644
--- a/test/cases/rlhc.d/case/cppscan3.cpp-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/cppscan3.cpp-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan3.cpp-C-G2--goto-backend.exp b/test/rlhc.d/case/cppscan3.cpp-C-G2--goto-backend.exp
index 987137ef..987137ef 100644
--- a/test/cases/rlhc.d/case/cppscan3.cpp-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan3.cpp-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan3.cpp-C-G2--goto-backend.in b/test/rlhc.d/case/cppscan3.cpp-C-G2--goto-backend.in
index cb0e93df..cb0e93df 100644
--- a/test/cases/rlhc.d/case/cppscan3.cpp-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/cppscan3.cpp-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan3.cpp-C-T0--goto-backend.exp b/test/rlhc.d/case/cppscan3.cpp-C-T0--goto-backend.exp
index 2ae9713c..2ae9713c 100644
--- a/test/cases/rlhc.d/case/cppscan3.cpp-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan3.cpp-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan3.cpp-C-T0--goto-backend.in b/test/rlhc.d/case/cppscan3.cpp-C-T0--goto-backend.in
index be8a306d..be8a306d 100644
--- a/test/cases/rlhc.d/case/cppscan3.cpp-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/cppscan3.cpp-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan3.cpp-C-T0--var-backend.exp b/test/rlhc.d/case/cppscan3.cpp-C-T0--var-backend.exp
index f1021fa5..f1021fa5 100644
--- a/test/cases/rlhc.d/case/cppscan3.cpp-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/cppscan3.cpp-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan3.cpp-C-T0--var-backend.in b/test/rlhc.d/case/cppscan3.cpp-C-T0--var-backend.in
index 6d6a0830..6d6a0830 100644
--- a/test/cases/rlhc.d/case/cppscan3.cpp-C-T0--var-backend.in
+++ b/test/rlhc.d/case/cppscan3.cpp-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan3.cpp-C-T1--goto-backend.exp b/test/rlhc.d/case/cppscan3.cpp-C-T1--goto-backend.exp
index 71c26c5a..71c26c5a 100644
--- a/test/cases/rlhc.d/case/cppscan3.cpp-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan3.cpp-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan3.cpp-C-T1--goto-backend.in b/test/rlhc.d/case/cppscan3.cpp-C-T1--goto-backend.in
index 4bbffed5..4bbffed5 100644
--- a/test/cases/rlhc.d/case/cppscan3.cpp-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/cppscan3.cpp-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan3.cpp-C-T1--var-backend.exp b/test/rlhc.d/case/cppscan3.cpp-C-T1--var-backend.exp
index 3bd70e75..3bd70e75 100644
--- a/test/cases/rlhc.d/case/cppscan3.cpp-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/cppscan3.cpp-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan3.cpp-C-T1--var-backend.in b/test/rlhc.d/case/cppscan3.cpp-C-T1--var-backend.in
index 8ae44b3c..8ae44b3c 100644
--- a/test/cases/rlhc.d/case/cppscan3.cpp-C-T1--var-backend.in
+++ b/test/rlhc.d/case/cppscan3.cpp-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_c.c-C-F0--goto-backend.exp b/test/rlhc.d/case/cppscan6_c.c-C-F0--goto-backend.exp
index 7b695226..7b695226 100644
--- a/test/cases/rlhc.d/case/cppscan6_c.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan6_c.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_c.c-C-F0--goto-backend.in b/test/rlhc.d/case/cppscan6_c.c-C-F0--goto-backend.in
index e255db71..e255db71 100644
--- a/test/cases/rlhc.d/case/cppscan6_c.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/cppscan6_c.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_c.c-C-F0--var-backend.exp b/test/rlhc.d/case/cppscan6_c.c-C-F0--var-backend.exp
index 6f036ebb..6f036ebb 100644
--- a/test/cases/rlhc.d/case/cppscan6_c.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/cppscan6_c.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_c.c-C-F0--var-backend.in b/test/rlhc.d/case/cppscan6_c.c-C-F0--var-backend.in
index ad6aa621..ad6aa621 100644
--- a/test/cases/rlhc.d/case/cppscan6_c.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/cppscan6_c.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_c.c-C-F1--goto-backend.exp b/test/rlhc.d/case/cppscan6_c.c-C-F1--goto-backend.exp
index d47277c9..d47277c9 100644
--- a/test/cases/rlhc.d/case/cppscan6_c.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan6_c.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_c.c-C-F1--goto-backend.in b/test/rlhc.d/case/cppscan6_c.c-C-F1--goto-backend.in
index 2c74bab0..2c74bab0 100644
--- a/test/cases/rlhc.d/case/cppscan6_c.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/cppscan6_c.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_c.c-C-F1--var-backend.exp b/test/rlhc.d/case/cppscan6_c.c-C-F1--var-backend.exp
index d111395c..d111395c 100644
--- a/test/cases/rlhc.d/case/cppscan6_c.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/cppscan6_c.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_c.c-C-F1--var-backend.in b/test/rlhc.d/case/cppscan6_c.c-C-F1--var-backend.in
index c4cee50c..c4cee50c 100644
--- a/test/cases/rlhc.d/case/cppscan6_c.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/cppscan6_c.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_c.c-C-G0--goto-backend.exp b/test/rlhc.d/case/cppscan6_c.c-C-G0--goto-backend.exp
index 5793bcb3..5793bcb3 100644
--- a/test/cases/rlhc.d/case/cppscan6_c.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan6_c.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_c.c-C-G0--goto-backend.in b/test/rlhc.d/case/cppscan6_c.c-C-G0--goto-backend.in
index 6dd9e73d..6dd9e73d 100644
--- a/test/cases/rlhc.d/case/cppscan6_c.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/cppscan6_c.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_c.c-C-G1--goto-backend.exp b/test/rlhc.d/case/cppscan6_c.c-C-G1--goto-backend.exp
index 4c337eb5..4c337eb5 100644
--- a/test/cases/rlhc.d/case/cppscan6_c.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan6_c.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_c.c-C-G1--goto-backend.in b/test/rlhc.d/case/cppscan6_c.c-C-G1--goto-backend.in
index dd90309f..dd90309f 100644
--- a/test/cases/rlhc.d/case/cppscan6_c.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/cppscan6_c.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_c.c-C-G2--goto-backend.exp b/test/rlhc.d/case/cppscan6_c.c-C-G2--goto-backend.exp
index aa21d0af..aa21d0af 100644
--- a/test/cases/rlhc.d/case/cppscan6_c.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan6_c.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_c.c-C-G2--goto-backend.in b/test/rlhc.d/case/cppscan6_c.c-C-G2--goto-backend.in
index 5addf4ae..5addf4ae 100644
--- a/test/cases/rlhc.d/case/cppscan6_c.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/cppscan6_c.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_c.c-C-T0--goto-backend.exp b/test/rlhc.d/case/cppscan6_c.c-C-T0--goto-backend.exp
index 20b95a23..20b95a23 100644
--- a/test/cases/rlhc.d/case/cppscan6_c.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan6_c.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_c.c-C-T0--goto-backend.in b/test/rlhc.d/case/cppscan6_c.c-C-T0--goto-backend.in
index 88da4b30..88da4b30 100644
--- a/test/cases/rlhc.d/case/cppscan6_c.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/cppscan6_c.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_c.c-C-T0--var-backend.exp b/test/rlhc.d/case/cppscan6_c.c-C-T0--var-backend.exp
index df7ec504..df7ec504 100644
--- a/test/cases/rlhc.d/case/cppscan6_c.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/cppscan6_c.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_c.c-C-T0--var-backend.in b/test/rlhc.d/case/cppscan6_c.c-C-T0--var-backend.in
index 7ad318cc..7ad318cc 100644
--- a/test/cases/rlhc.d/case/cppscan6_c.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/cppscan6_c.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_c.c-C-T1--goto-backend.exp b/test/rlhc.d/case/cppscan6_c.c-C-T1--goto-backend.exp
index 0b9c92d6..0b9c92d6 100644
--- a/test/cases/rlhc.d/case/cppscan6_c.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan6_c.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_c.c-C-T1--goto-backend.in b/test/rlhc.d/case/cppscan6_c.c-C-T1--goto-backend.in
index e05b2601..e05b2601 100644
--- a/test/cases/rlhc.d/case/cppscan6_c.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/cppscan6_c.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_c.c-C-T1--var-backend.exp b/test/rlhc.d/case/cppscan6_c.c-C-T1--var-backend.exp
index 37ae922c..37ae922c 100644
--- a/test/cases/rlhc.d/case/cppscan6_c.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/cppscan6_c.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_c.c-C-T1--var-backend.in b/test/rlhc.d/case/cppscan6_c.c-C-T1--var-backend.in
index 4d1b30cb..4d1b30cb 100644
--- a/test/cases/rlhc.d/case/cppscan6_c.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/cppscan6_c.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_crack.crk-K-F0--var-backend.exp b/test/rlhc.d/case/cppscan6_crack.crk-K-F0--var-backend.exp
index 1ca19405..1ca19405 100644
--- a/test/cases/rlhc.d/case/cppscan6_crack.crk-K-F0--var-backend.exp
+++ b/test/rlhc.d/case/cppscan6_crack.crk-K-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_crack.crk-K-F0--var-backend.in b/test/rlhc.d/case/cppscan6_crack.crk-K-F0--var-backend.in
index b0b58999..b0b58999 100644
--- a/test/cases/rlhc.d/case/cppscan6_crack.crk-K-F0--var-backend.in
+++ b/test/rlhc.d/case/cppscan6_crack.crk-K-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_crack.crk-K-F1--var-backend.exp b/test/rlhc.d/case/cppscan6_crack.crk-K-F1--var-backend.exp
index 2ffe35e5..2ffe35e5 100644
--- a/test/cases/rlhc.d/case/cppscan6_crack.crk-K-F1--var-backend.exp
+++ b/test/rlhc.d/case/cppscan6_crack.crk-K-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_crack.crk-K-F1--var-backend.in b/test/rlhc.d/case/cppscan6_crack.crk-K-F1--var-backend.in
index e49e1f84..e49e1f84 100644
--- a/test/cases/rlhc.d/case/cppscan6_crack.crk-K-F1--var-backend.in
+++ b/test/rlhc.d/case/cppscan6_crack.crk-K-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_crack.crk-K-T0--var-backend.exp b/test/rlhc.d/case/cppscan6_crack.crk-K-T0--var-backend.exp
index fa5722ad..fa5722ad 100644
--- a/test/cases/rlhc.d/case/cppscan6_crack.crk-K-T0--var-backend.exp
+++ b/test/rlhc.d/case/cppscan6_crack.crk-K-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_crack.crk-K-T0--var-backend.in b/test/rlhc.d/case/cppscan6_crack.crk-K-T0--var-backend.in
index 80a5a524..80a5a524 100644
--- a/test/cases/rlhc.d/case/cppscan6_crack.crk-K-T0--var-backend.in
+++ b/test/rlhc.d/case/cppscan6_crack.crk-K-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_crack.crk-K-T1--var-backend.exp b/test/rlhc.d/case/cppscan6_crack.crk-K-T1--var-backend.exp
index 19108209..19108209 100644
--- a/test/cases/rlhc.d/case/cppscan6_crack.crk-K-T1--var-backend.exp
+++ b/test/rlhc.d/case/cppscan6_crack.crk-K-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_crack.crk-K-T1--var-backend.in b/test/rlhc.d/case/cppscan6_crack.crk-K-T1--var-backend.in
index f2597734..f2597734 100644
--- a/test/cases/rlhc.d/case/cppscan6_crack.crk-K-T1--var-backend.in
+++ b/test/rlhc.d/case/cppscan6_crack.crk-K-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_cs.cs-A-F0--goto-backend.exp b/test/rlhc.d/case/cppscan6_cs.cs-A-F0--goto-backend.exp
index 8ea32956..8ea32956 100644
--- a/test/cases/rlhc.d/case/cppscan6_cs.cs-A-F0--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan6_cs.cs-A-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_cs.cs-A-F0--goto-backend.in b/test/rlhc.d/case/cppscan6_cs.cs-A-F0--goto-backend.in
index 7dd53be6..7dd53be6 100644
--- a/test/cases/rlhc.d/case/cppscan6_cs.cs-A-F0--goto-backend.in
+++ b/test/rlhc.d/case/cppscan6_cs.cs-A-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_cs.cs-A-F0--var-backend.exp b/test/rlhc.d/case/cppscan6_cs.cs-A-F0--var-backend.exp
index 7edaddc6..7edaddc6 100644
--- a/test/cases/rlhc.d/case/cppscan6_cs.cs-A-F0--var-backend.exp
+++ b/test/rlhc.d/case/cppscan6_cs.cs-A-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_cs.cs-A-F0--var-backend.in b/test/rlhc.d/case/cppscan6_cs.cs-A-F0--var-backend.in
index 7b7623b1..7b7623b1 100644
--- a/test/cases/rlhc.d/case/cppscan6_cs.cs-A-F0--var-backend.in
+++ b/test/rlhc.d/case/cppscan6_cs.cs-A-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_cs.cs-A-F1--goto-backend.exp b/test/rlhc.d/case/cppscan6_cs.cs-A-F1--goto-backend.exp
index 3345f3f6..3345f3f6 100644
--- a/test/cases/rlhc.d/case/cppscan6_cs.cs-A-F1--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan6_cs.cs-A-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_cs.cs-A-F1--goto-backend.in b/test/rlhc.d/case/cppscan6_cs.cs-A-F1--goto-backend.in
index c4fb5f4a..c4fb5f4a 100644
--- a/test/cases/rlhc.d/case/cppscan6_cs.cs-A-F1--goto-backend.in
+++ b/test/rlhc.d/case/cppscan6_cs.cs-A-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_cs.cs-A-F1--var-backend.exp b/test/rlhc.d/case/cppscan6_cs.cs-A-F1--var-backend.exp
index 36c0c4b2..36c0c4b2 100644
--- a/test/cases/rlhc.d/case/cppscan6_cs.cs-A-F1--var-backend.exp
+++ b/test/rlhc.d/case/cppscan6_cs.cs-A-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_cs.cs-A-F1--var-backend.in b/test/rlhc.d/case/cppscan6_cs.cs-A-F1--var-backend.in
index c563ccc0..c563ccc0 100644
--- a/test/cases/rlhc.d/case/cppscan6_cs.cs-A-F1--var-backend.in
+++ b/test/rlhc.d/case/cppscan6_cs.cs-A-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_cs.cs-A-G0--goto-backend.exp b/test/rlhc.d/case/cppscan6_cs.cs-A-G0--goto-backend.exp
index 960c9e8d..960c9e8d 100644
--- a/test/cases/rlhc.d/case/cppscan6_cs.cs-A-G0--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan6_cs.cs-A-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_cs.cs-A-G0--goto-backend.in b/test/rlhc.d/case/cppscan6_cs.cs-A-G0--goto-backend.in
index 7e4c4336..7e4c4336 100644
--- a/test/cases/rlhc.d/case/cppscan6_cs.cs-A-G0--goto-backend.in
+++ b/test/rlhc.d/case/cppscan6_cs.cs-A-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_cs.cs-A-G1--goto-backend.exp b/test/rlhc.d/case/cppscan6_cs.cs-A-G1--goto-backend.exp
index d9539dd2..d9539dd2 100644
--- a/test/cases/rlhc.d/case/cppscan6_cs.cs-A-G1--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan6_cs.cs-A-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_cs.cs-A-G1--goto-backend.in b/test/rlhc.d/case/cppscan6_cs.cs-A-G1--goto-backend.in
index 9e673aea..9e673aea 100644
--- a/test/cases/rlhc.d/case/cppscan6_cs.cs-A-G1--goto-backend.in
+++ b/test/rlhc.d/case/cppscan6_cs.cs-A-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_cs.cs-A-T0--goto-backend.exp b/test/rlhc.d/case/cppscan6_cs.cs-A-T0--goto-backend.exp
index 1c0d9ab9..1c0d9ab9 100644
--- a/test/cases/rlhc.d/case/cppscan6_cs.cs-A-T0--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan6_cs.cs-A-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_cs.cs-A-T0--goto-backend.in b/test/rlhc.d/case/cppscan6_cs.cs-A-T0--goto-backend.in
index b454399d..b454399d 100644
--- a/test/cases/rlhc.d/case/cppscan6_cs.cs-A-T0--goto-backend.in
+++ b/test/rlhc.d/case/cppscan6_cs.cs-A-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_cs.cs-A-T0--var-backend.exp b/test/rlhc.d/case/cppscan6_cs.cs-A-T0--var-backend.exp
index 50ef0475..50ef0475 100644
--- a/test/cases/rlhc.d/case/cppscan6_cs.cs-A-T0--var-backend.exp
+++ b/test/rlhc.d/case/cppscan6_cs.cs-A-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_cs.cs-A-T0--var-backend.in b/test/rlhc.d/case/cppscan6_cs.cs-A-T0--var-backend.in
index a273fd6d..a273fd6d 100644
--- a/test/cases/rlhc.d/case/cppscan6_cs.cs-A-T0--var-backend.in
+++ b/test/rlhc.d/case/cppscan6_cs.cs-A-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_cs.cs-A-T1--goto-backend.exp b/test/rlhc.d/case/cppscan6_cs.cs-A-T1--goto-backend.exp
index 30455b78..30455b78 100644
--- a/test/cases/rlhc.d/case/cppscan6_cs.cs-A-T1--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan6_cs.cs-A-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_cs.cs-A-T1--goto-backend.in b/test/rlhc.d/case/cppscan6_cs.cs-A-T1--goto-backend.in
index 2c4fcdbc..2c4fcdbc 100644
--- a/test/cases/rlhc.d/case/cppscan6_cs.cs-A-T1--goto-backend.in
+++ b/test/rlhc.d/case/cppscan6_cs.cs-A-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_cs.cs-A-T1--var-backend.exp b/test/rlhc.d/case/cppscan6_cs.cs-A-T1--var-backend.exp
index f80c9cb4..f80c9cb4 100644
--- a/test/cases/rlhc.d/case/cppscan6_cs.cs-A-T1--var-backend.exp
+++ b/test/rlhc.d/case/cppscan6_cs.cs-A-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_cs.cs-A-T1--var-backend.in b/test/rlhc.d/case/cppscan6_cs.cs-A-T1--var-backend.in
index 9a4708e8..9a4708e8 100644
--- a/test/cases/rlhc.d/case/cppscan6_cs.cs-A-T1--var-backend.in
+++ b/test/rlhc.d/case/cppscan6_cs.cs-A-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_go.go-Z-F0--goto-backend.exp b/test/rlhc.d/case/cppscan6_go.go-Z-F0--goto-backend.exp
index 141d0e48..141d0e48 100644
--- a/test/cases/rlhc.d/case/cppscan6_go.go-Z-F0--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan6_go.go-Z-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_go.go-Z-F0--goto-backend.in b/test/rlhc.d/case/cppscan6_go.go-Z-F0--goto-backend.in
index fbdddb3f..fbdddb3f 100644
--- a/test/cases/rlhc.d/case/cppscan6_go.go-Z-F0--goto-backend.in
+++ b/test/rlhc.d/case/cppscan6_go.go-Z-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_go.go-Z-F0--var-backend.exp b/test/rlhc.d/case/cppscan6_go.go-Z-F0--var-backend.exp
index 096db7f0..096db7f0 100644
--- a/test/cases/rlhc.d/case/cppscan6_go.go-Z-F0--var-backend.exp
+++ b/test/rlhc.d/case/cppscan6_go.go-Z-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_go.go-Z-F0--var-backend.in b/test/rlhc.d/case/cppscan6_go.go-Z-F0--var-backend.in
index 17fd0365..17fd0365 100644
--- a/test/cases/rlhc.d/case/cppscan6_go.go-Z-F0--var-backend.in
+++ b/test/rlhc.d/case/cppscan6_go.go-Z-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_go.go-Z-F1--goto-backend.exp b/test/rlhc.d/case/cppscan6_go.go-Z-F1--goto-backend.exp
index 89243a6e..89243a6e 100644
--- a/test/cases/rlhc.d/case/cppscan6_go.go-Z-F1--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan6_go.go-Z-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_go.go-Z-F1--goto-backend.in b/test/rlhc.d/case/cppscan6_go.go-Z-F1--goto-backend.in
index 2ccc6bc1..2ccc6bc1 100644
--- a/test/cases/rlhc.d/case/cppscan6_go.go-Z-F1--goto-backend.in
+++ b/test/rlhc.d/case/cppscan6_go.go-Z-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_go.go-Z-F1--var-backend.exp b/test/rlhc.d/case/cppscan6_go.go-Z-F1--var-backend.exp
index 535a0bc5..535a0bc5 100644
--- a/test/cases/rlhc.d/case/cppscan6_go.go-Z-F1--var-backend.exp
+++ b/test/rlhc.d/case/cppscan6_go.go-Z-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_go.go-Z-F1--var-backend.in b/test/rlhc.d/case/cppscan6_go.go-Z-F1--var-backend.in
index 8ffee4bb..8ffee4bb 100644
--- a/test/cases/rlhc.d/case/cppscan6_go.go-Z-F1--var-backend.in
+++ b/test/rlhc.d/case/cppscan6_go.go-Z-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_go.go-Z-G0--goto-backend.exp b/test/rlhc.d/case/cppscan6_go.go-Z-G0--goto-backend.exp
index 718caba5..718caba5 100644
--- a/test/cases/rlhc.d/case/cppscan6_go.go-Z-G0--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan6_go.go-Z-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_go.go-Z-G0--goto-backend.in b/test/rlhc.d/case/cppscan6_go.go-Z-G0--goto-backend.in
index a68d61b0..a68d61b0 100644
--- a/test/cases/rlhc.d/case/cppscan6_go.go-Z-G0--goto-backend.in
+++ b/test/rlhc.d/case/cppscan6_go.go-Z-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_go.go-Z-G1--goto-backend.exp b/test/rlhc.d/case/cppscan6_go.go-Z-G1--goto-backend.exp
index 6b897dff..6b897dff 100644
--- a/test/cases/rlhc.d/case/cppscan6_go.go-Z-G1--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan6_go.go-Z-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_go.go-Z-G1--goto-backend.in b/test/rlhc.d/case/cppscan6_go.go-Z-G1--goto-backend.in
index acc388be..acc388be 100644
--- a/test/cases/rlhc.d/case/cppscan6_go.go-Z-G1--goto-backend.in
+++ b/test/rlhc.d/case/cppscan6_go.go-Z-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_go.go-Z-G2--goto-backend.exp b/test/rlhc.d/case/cppscan6_go.go-Z-G2--goto-backend.exp
index a68bb398..a68bb398 100644
--- a/test/cases/rlhc.d/case/cppscan6_go.go-Z-G2--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan6_go.go-Z-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_go.go-Z-G2--goto-backend.in b/test/rlhc.d/case/cppscan6_go.go-Z-G2--goto-backend.in
index ef4b22d8..ef4b22d8 100644
--- a/test/cases/rlhc.d/case/cppscan6_go.go-Z-G2--goto-backend.in
+++ b/test/rlhc.d/case/cppscan6_go.go-Z-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_go.go-Z-T0--goto-backend.exp b/test/rlhc.d/case/cppscan6_go.go-Z-T0--goto-backend.exp
index 0e4702a0..0e4702a0 100644
--- a/test/cases/rlhc.d/case/cppscan6_go.go-Z-T0--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan6_go.go-Z-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_go.go-Z-T0--goto-backend.in b/test/rlhc.d/case/cppscan6_go.go-Z-T0--goto-backend.in
index 1fcc6a23..1fcc6a23 100644
--- a/test/cases/rlhc.d/case/cppscan6_go.go-Z-T0--goto-backend.in
+++ b/test/rlhc.d/case/cppscan6_go.go-Z-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_go.go-Z-T0--var-backend.exp b/test/rlhc.d/case/cppscan6_go.go-Z-T0--var-backend.exp
index 082fcb99..082fcb99 100644
--- a/test/cases/rlhc.d/case/cppscan6_go.go-Z-T0--var-backend.exp
+++ b/test/rlhc.d/case/cppscan6_go.go-Z-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_go.go-Z-T0--var-backend.in b/test/rlhc.d/case/cppscan6_go.go-Z-T0--var-backend.in
index 6d537ebb..6d537ebb 100644
--- a/test/cases/rlhc.d/case/cppscan6_go.go-Z-T0--var-backend.in
+++ b/test/rlhc.d/case/cppscan6_go.go-Z-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_go.go-Z-T1--goto-backend.exp b/test/rlhc.d/case/cppscan6_go.go-Z-T1--goto-backend.exp
index 70522c51..70522c51 100644
--- a/test/cases/rlhc.d/case/cppscan6_go.go-Z-T1--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan6_go.go-Z-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_go.go-Z-T1--goto-backend.in b/test/rlhc.d/case/cppscan6_go.go-Z-T1--goto-backend.in
index 5cff7362..5cff7362 100644
--- a/test/cases/rlhc.d/case/cppscan6_go.go-Z-T1--goto-backend.in
+++ b/test/rlhc.d/case/cppscan6_go.go-Z-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_go.go-Z-T1--var-backend.exp b/test/rlhc.d/case/cppscan6_go.go-Z-T1--var-backend.exp
index f1bf137d..f1bf137d 100644
--- a/test/cases/rlhc.d/case/cppscan6_go.go-Z-T1--var-backend.exp
+++ b/test/rlhc.d/case/cppscan6_go.go-Z-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_go.go-Z-T1--var-backend.in b/test/rlhc.d/case/cppscan6_go.go-Z-T1--var-backend.in
index 36fd2b5d..36fd2b5d 100644
--- a/test/cases/rlhc.d/case/cppscan6_go.go-Z-T1--var-backend.in
+++ b/test/rlhc.d/case/cppscan6_go.go-Z-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_java.java-J-F0--goto-backend.exp b/test/rlhc.d/case/cppscan6_java.java-J-F0--goto-backend.exp
index cd04410f..cd04410f 100644
--- a/test/cases/rlhc.d/case/cppscan6_java.java-J-F0--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan6_java.java-J-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_java.java-J-F0--goto-backend.in b/test/rlhc.d/case/cppscan6_java.java-J-F0--goto-backend.in
index d75177c3..d75177c3 100644
--- a/test/cases/rlhc.d/case/cppscan6_java.java-J-F0--goto-backend.in
+++ b/test/rlhc.d/case/cppscan6_java.java-J-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_java.java-J-F0--var-backend.exp b/test/rlhc.d/case/cppscan6_java.java-J-F0--var-backend.exp
index b01621c3..b01621c3 100644
--- a/test/cases/rlhc.d/case/cppscan6_java.java-J-F0--var-backend.exp
+++ b/test/rlhc.d/case/cppscan6_java.java-J-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_java.java-J-F0--var-backend.in b/test/rlhc.d/case/cppscan6_java.java-J-F0--var-backend.in
index 716e78bf..716e78bf 100644
--- a/test/cases/rlhc.d/case/cppscan6_java.java-J-F0--var-backend.in
+++ b/test/rlhc.d/case/cppscan6_java.java-J-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_java.java-J-F1--goto-backend.exp b/test/rlhc.d/case/cppscan6_java.java-J-F1--goto-backend.exp
index e8e878f9..e8e878f9 100644
--- a/test/cases/rlhc.d/case/cppscan6_java.java-J-F1--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan6_java.java-J-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_java.java-J-F1--goto-backend.in b/test/rlhc.d/case/cppscan6_java.java-J-F1--goto-backend.in
index 9505701b..9505701b 100644
--- a/test/cases/rlhc.d/case/cppscan6_java.java-J-F1--goto-backend.in
+++ b/test/rlhc.d/case/cppscan6_java.java-J-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_java.java-J-F1--var-backend.exp b/test/rlhc.d/case/cppscan6_java.java-J-F1--var-backend.exp
index 357d9082..357d9082 100644
--- a/test/cases/rlhc.d/case/cppscan6_java.java-J-F1--var-backend.exp
+++ b/test/rlhc.d/case/cppscan6_java.java-J-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_java.java-J-F1--var-backend.in b/test/rlhc.d/case/cppscan6_java.java-J-F1--var-backend.in
index f7105ec5..f7105ec5 100644
--- a/test/cases/rlhc.d/case/cppscan6_java.java-J-F1--var-backend.in
+++ b/test/rlhc.d/case/cppscan6_java.java-J-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_java.java-J-T0--goto-backend.exp b/test/rlhc.d/case/cppscan6_java.java-J-T0--goto-backend.exp
index d523ce84..d523ce84 100644
--- a/test/cases/rlhc.d/case/cppscan6_java.java-J-T0--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan6_java.java-J-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_java.java-J-T0--goto-backend.in b/test/rlhc.d/case/cppscan6_java.java-J-T0--goto-backend.in
index f2725aa5..f2725aa5 100644
--- a/test/cases/rlhc.d/case/cppscan6_java.java-J-T0--goto-backend.in
+++ b/test/rlhc.d/case/cppscan6_java.java-J-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_java.java-J-T0--var-backend.exp b/test/rlhc.d/case/cppscan6_java.java-J-T0--var-backend.exp
index c84f0f5e..c84f0f5e 100644
--- a/test/cases/rlhc.d/case/cppscan6_java.java-J-T0--var-backend.exp
+++ b/test/rlhc.d/case/cppscan6_java.java-J-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_java.java-J-T0--var-backend.in b/test/rlhc.d/case/cppscan6_java.java-J-T0--var-backend.in
index e8f7c874..e8f7c874 100644
--- a/test/cases/rlhc.d/case/cppscan6_java.java-J-T0--var-backend.in
+++ b/test/rlhc.d/case/cppscan6_java.java-J-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_java.java-J-T1--goto-backend.exp b/test/rlhc.d/case/cppscan6_java.java-J-T1--goto-backend.exp
index 7a26221a..7a26221a 100644
--- a/test/cases/rlhc.d/case/cppscan6_java.java-J-T1--goto-backend.exp
+++ b/test/rlhc.d/case/cppscan6_java.java-J-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_java.java-J-T1--goto-backend.in b/test/rlhc.d/case/cppscan6_java.java-J-T1--goto-backend.in
index 3224c0b5..3224c0b5 100644
--- a/test/cases/rlhc.d/case/cppscan6_java.java-J-T1--goto-backend.in
+++ b/test/rlhc.d/case/cppscan6_java.java-J-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_java.java-J-T1--var-backend.exp b/test/rlhc.d/case/cppscan6_java.java-J-T1--var-backend.exp
index cd52e3bf..cd52e3bf 100644
--- a/test/cases/rlhc.d/case/cppscan6_java.java-J-T1--var-backend.exp
+++ b/test/rlhc.d/case/cppscan6_java.java-J-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_java.java-J-T1--var-backend.in b/test/rlhc.d/case/cppscan6_java.java-J-T1--var-backend.in
index f24d6bc1..f24d6bc1 100644
--- a/test/cases/rlhc.d/case/cppscan6_java.java-J-T1--var-backend.in
+++ b/test/rlhc.d/case/cppscan6_java.java-J-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_julia.jl-Y-F0--var-backend.exp b/test/rlhc.d/case/cppscan6_julia.jl-Y-F0--var-backend.exp
index 6c72916d..6c72916d 100644
--- a/test/cases/rlhc.d/case/cppscan6_julia.jl-Y-F0--var-backend.exp
+++ b/test/rlhc.d/case/cppscan6_julia.jl-Y-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_julia.jl-Y-F0--var-backend.in b/test/rlhc.d/case/cppscan6_julia.jl-Y-F0--var-backend.in
index 50341c54..50341c54 100644
--- a/test/cases/rlhc.d/case/cppscan6_julia.jl-Y-F0--var-backend.in
+++ b/test/rlhc.d/case/cppscan6_julia.jl-Y-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_julia.jl-Y-F1--var-backend.exp b/test/rlhc.d/case/cppscan6_julia.jl-Y-F1--var-backend.exp
index 14252e83..14252e83 100644
--- a/test/cases/rlhc.d/case/cppscan6_julia.jl-Y-F1--var-backend.exp
+++ b/test/rlhc.d/case/cppscan6_julia.jl-Y-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_julia.jl-Y-F1--var-backend.in b/test/rlhc.d/case/cppscan6_julia.jl-Y-F1--var-backend.in
index 87e6efd3..87e6efd3 100644
--- a/test/cases/rlhc.d/case/cppscan6_julia.jl-Y-F1--var-backend.in
+++ b/test/rlhc.d/case/cppscan6_julia.jl-Y-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_julia.jl-Y-T0--var-backend.exp b/test/rlhc.d/case/cppscan6_julia.jl-Y-T0--var-backend.exp
index 07fca0da..07fca0da 100644
--- a/test/cases/rlhc.d/case/cppscan6_julia.jl-Y-T0--var-backend.exp
+++ b/test/rlhc.d/case/cppscan6_julia.jl-Y-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_julia.jl-Y-T0--var-backend.in b/test/rlhc.d/case/cppscan6_julia.jl-Y-T0--var-backend.in
index 144a14fe..144a14fe 100644
--- a/test/cases/rlhc.d/case/cppscan6_julia.jl-Y-T0--var-backend.in
+++ b/test/rlhc.d/case/cppscan6_julia.jl-Y-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_julia.jl-Y-T1--var-backend.exp b/test/rlhc.d/case/cppscan6_julia.jl-Y-T1--var-backend.exp
index 7ad80b54..7ad80b54 100644
--- a/test/cases/rlhc.d/case/cppscan6_julia.jl-Y-T1--var-backend.exp
+++ b/test/rlhc.d/case/cppscan6_julia.jl-Y-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_julia.jl-Y-T1--var-backend.in b/test/rlhc.d/case/cppscan6_julia.jl-Y-T1--var-backend.in
index ff53fb0e..ff53fb0e 100644
--- a/test/cases/rlhc.d/case/cppscan6_julia.jl-Y-T1--var-backend.in
+++ b/test/rlhc.d/case/cppscan6_julia.jl-Y-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_ocaml.ml-O-F0--var-backend.exp b/test/rlhc.d/case/cppscan6_ocaml.ml-O-F0--var-backend.exp
index 24126c8e..24126c8e 100644
--- a/test/cases/rlhc.d/case/cppscan6_ocaml.ml-O-F0--var-backend.exp
+++ b/test/rlhc.d/case/cppscan6_ocaml.ml-O-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_ocaml.ml-O-F0--var-backend.in b/test/rlhc.d/case/cppscan6_ocaml.ml-O-F0--var-backend.in
index cd6dea5c..cd6dea5c 100644
--- a/test/cases/rlhc.d/case/cppscan6_ocaml.ml-O-F0--var-backend.in
+++ b/test/rlhc.d/case/cppscan6_ocaml.ml-O-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_ocaml.ml-O-F1--var-backend.exp b/test/rlhc.d/case/cppscan6_ocaml.ml-O-F1--var-backend.exp
index c3ced877..c3ced877 100644
--- a/test/cases/rlhc.d/case/cppscan6_ocaml.ml-O-F1--var-backend.exp
+++ b/test/rlhc.d/case/cppscan6_ocaml.ml-O-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_ocaml.ml-O-F1--var-backend.in b/test/rlhc.d/case/cppscan6_ocaml.ml-O-F1--var-backend.in
index 40e34404..40e34404 100644
--- a/test/cases/rlhc.d/case/cppscan6_ocaml.ml-O-F1--var-backend.in
+++ b/test/rlhc.d/case/cppscan6_ocaml.ml-O-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_ocaml.ml-O-T0--var-backend.exp b/test/rlhc.d/case/cppscan6_ocaml.ml-O-T0--var-backend.exp
index 65f4cdb8..65f4cdb8 100644
--- a/test/cases/rlhc.d/case/cppscan6_ocaml.ml-O-T0--var-backend.exp
+++ b/test/rlhc.d/case/cppscan6_ocaml.ml-O-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_ocaml.ml-O-T0--var-backend.in b/test/rlhc.d/case/cppscan6_ocaml.ml-O-T0--var-backend.in
index 24e96e1e..24e96e1e 100644
--- a/test/cases/rlhc.d/case/cppscan6_ocaml.ml-O-T0--var-backend.in
+++ b/test/rlhc.d/case/cppscan6_ocaml.ml-O-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_ocaml.ml-O-T1--var-backend.exp b/test/rlhc.d/case/cppscan6_ocaml.ml-O-T1--var-backend.exp
index 1f589877..1f589877 100644
--- a/test/cases/rlhc.d/case/cppscan6_ocaml.ml-O-T1--var-backend.exp
+++ b/test/rlhc.d/case/cppscan6_ocaml.ml-O-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_ocaml.ml-O-T1--var-backend.in b/test/rlhc.d/case/cppscan6_ocaml.ml-O-T1--var-backend.in
index 7e602469..7e602469 100644
--- a/test/cases/rlhc.d/case/cppscan6_ocaml.ml-O-T1--var-backend.in
+++ b/test/rlhc.d/case/cppscan6_ocaml.ml-O-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_ruby.rb-R-F0--var-backend.exp b/test/rlhc.d/case/cppscan6_ruby.rb-R-F0--var-backend.exp
index 19d23793..19d23793 100644
--- a/test/cases/rlhc.d/case/cppscan6_ruby.rb-R-F0--var-backend.exp
+++ b/test/rlhc.d/case/cppscan6_ruby.rb-R-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_ruby.rb-R-F0--var-backend.in b/test/rlhc.d/case/cppscan6_ruby.rb-R-F0--var-backend.in
index 58dc88b9..58dc88b9 100644
--- a/test/cases/rlhc.d/case/cppscan6_ruby.rb-R-F0--var-backend.in
+++ b/test/rlhc.d/case/cppscan6_ruby.rb-R-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_ruby.rb-R-F1--var-backend.exp b/test/rlhc.d/case/cppscan6_ruby.rb-R-F1--var-backend.exp
index c293875b..c293875b 100644
--- a/test/cases/rlhc.d/case/cppscan6_ruby.rb-R-F1--var-backend.exp
+++ b/test/rlhc.d/case/cppscan6_ruby.rb-R-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_ruby.rb-R-F1--var-backend.in b/test/rlhc.d/case/cppscan6_ruby.rb-R-F1--var-backend.in
index f5a72493..f5a72493 100644
--- a/test/cases/rlhc.d/case/cppscan6_ruby.rb-R-F1--var-backend.in
+++ b/test/rlhc.d/case/cppscan6_ruby.rb-R-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_ruby.rb-R-T0--var-backend.exp b/test/rlhc.d/case/cppscan6_ruby.rb-R-T0--var-backend.exp
index 0080e51d..0080e51d 100644
--- a/test/cases/rlhc.d/case/cppscan6_ruby.rb-R-T0--var-backend.exp
+++ b/test/rlhc.d/case/cppscan6_ruby.rb-R-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_ruby.rb-R-T0--var-backend.in b/test/rlhc.d/case/cppscan6_ruby.rb-R-T0--var-backend.in
index ae2277e2..ae2277e2 100644
--- a/test/cases/rlhc.d/case/cppscan6_ruby.rb-R-T0--var-backend.in
+++ b/test/rlhc.d/case/cppscan6_ruby.rb-R-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_ruby.rb-R-T1--var-backend.exp b/test/rlhc.d/case/cppscan6_ruby.rb-R-T1--var-backend.exp
index f18f66de..f18f66de 100644
--- a/test/cases/rlhc.d/case/cppscan6_ruby.rb-R-T1--var-backend.exp
+++ b/test/rlhc.d/case/cppscan6_ruby.rb-R-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_ruby.rb-R-T1--var-backend.in b/test/rlhc.d/case/cppscan6_ruby.rb-R-T1--var-backend.in
index c216db0b..c216db0b 100644
--- a/test/cases/rlhc.d/case/cppscan6_ruby.rb-R-T1--var-backend.in
+++ b/test/rlhc.d/case/cppscan6_ruby.rb-R-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_rust.rs-U-F0--var-backend.exp b/test/rlhc.d/case/cppscan6_rust.rs-U-F0--var-backend.exp
index 671ec304..671ec304 100644
--- a/test/cases/rlhc.d/case/cppscan6_rust.rs-U-F0--var-backend.exp
+++ b/test/rlhc.d/case/cppscan6_rust.rs-U-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_rust.rs-U-F0--var-backend.in b/test/rlhc.d/case/cppscan6_rust.rs-U-F0--var-backend.in
index f96a273a..f96a273a 100644
--- a/test/cases/rlhc.d/case/cppscan6_rust.rs-U-F0--var-backend.in
+++ b/test/rlhc.d/case/cppscan6_rust.rs-U-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_rust.rs-U-F1--var-backend.exp b/test/rlhc.d/case/cppscan6_rust.rs-U-F1--var-backend.exp
index 8d5eb3af..8d5eb3af 100644
--- a/test/cases/rlhc.d/case/cppscan6_rust.rs-U-F1--var-backend.exp
+++ b/test/rlhc.d/case/cppscan6_rust.rs-U-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_rust.rs-U-F1--var-backend.in b/test/rlhc.d/case/cppscan6_rust.rs-U-F1--var-backend.in
index 62e7847d..62e7847d 100644
--- a/test/cases/rlhc.d/case/cppscan6_rust.rs-U-F1--var-backend.in
+++ b/test/rlhc.d/case/cppscan6_rust.rs-U-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_rust.rs-U-T0--var-backend.exp b/test/rlhc.d/case/cppscan6_rust.rs-U-T0--var-backend.exp
index ae9f8aca..ae9f8aca 100644
--- a/test/cases/rlhc.d/case/cppscan6_rust.rs-U-T0--var-backend.exp
+++ b/test/rlhc.d/case/cppscan6_rust.rs-U-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_rust.rs-U-T0--var-backend.in b/test/rlhc.d/case/cppscan6_rust.rs-U-T0--var-backend.in
index 46bedf36..46bedf36 100644
--- a/test/cases/rlhc.d/case/cppscan6_rust.rs-U-T0--var-backend.in
+++ b/test/rlhc.d/case/cppscan6_rust.rs-U-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/cppscan6_rust.rs-U-T1--var-backend.exp b/test/rlhc.d/case/cppscan6_rust.rs-U-T1--var-backend.exp
index a04cb60f..a04cb60f 100644
--- a/test/cases/rlhc.d/case/cppscan6_rust.rs-U-T1--var-backend.exp
+++ b/test/rlhc.d/case/cppscan6_rust.rs-U-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/cppscan6_rust.rs-U-T1--var-backend.in b/test/rlhc.d/case/cppscan6_rust.rs-U-T1--var-backend.in
index d326659b..d326659b 100644
--- a/test/cases/rlhc.d/case/cppscan6_rust.rs-U-T1--var-backend.in
+++ b/test/rlhc.d/case/cppscan6_rust.rs-U-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/crack1.crk-K-F0--var-backend.exp b/test/rlhc.d/case/crack1.crk-K-F0--var-backend.exp
index fa75b737..fa75b737 100644
--- a/test/cases/rlhc.d/case/crack1.crk-K-F0--var-backend.exp
+++ b/test/rlhc.d/case/crack1.crk-K-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/crack1.crk-K-F0--var-backend.in b/test/rlhc.d/case/crack1.crk-K-F0--var-backend.in
index c906cd9c..c906cd9c 100644
--- a/test/cases/rlhc.d/case/crack1.crk-K-F0--var-backend.in
+++ b/test/rlhc.d/case/crack1.crk-K-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/crack1.crk-K-F1--var-backend.exp b/test/rlhc.d/case/crack1.crk-K-F1--var-backend.exp
index ce01b4e9..ce01b4e9 100644
--- a/test/cases/rlhc.d/case/crack1.crk-K-F1--var-backend.exp
+++ b/test/rlhc.d/case/crack1.crk-K-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/crack1.crk-K-F1--var-backend.in b/test/rlhc.d/case/crack1.crk-K-F1--var-backend.in
index f9bd160c..f9bd160c 100644
--- a/test/cases/rlhc.d/case/crack1.crk-K-F1--var-backend.in
+++ b/test/rlhc.d/case/crack1.crk-K-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/crack1.crk-K-T0--var-backend.exp b/test/rlhc.d/case/crack1.crk-K-T0--var-backend.exp
index fa529ff9..fa529ff9 100644
--- a/test/cases/rlhc.d/case/crack1.crk-K-T0--var-backend.exp
+++ b/test/rlhc.d/case/crack1.crk-K-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/crack1.crk-K-T0--var-backend.in b/test/rlhc.d/case/crack1.crk-K-T0--var-backend.in
index 5f76fe14..5f76fe14 100644
--- a/test/cases/rlhc.d/case/crack1.crk-K-T0--var-backend.in
+++ b/test/rlhc.d/case/crack1.crk-K-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/crack1.crk-K-T1--var-backend.exp b/test/rlhc.d/case/crack1.crk-K-T1--var-backend.exp
index d462515d..d462515d 100644
--- a/test/cases/rlhc.d/case/crack1.crk-K-T1--var-backend.exp
+++ b/test/rlhc.d/case/crack1.crk-K-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/crack1.crk-K-T1--var-backend.in b/test/rlhc.d/case/crack1.crk-K-T1--var-backend.in
index 5af52757..5af52757 100644
--- a/test/cases/rlhc.d/case/crack1.crk-K-T1--var-backend.in
+++ b/test/rlhc.d/case/crack1.crk-K-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_c.c-C-F0--goto-backend.exp b/test/rlhc.d/case/curs1_c.c-C-F0--goto-backend.exp
index e2549479..e2549479 100644
--- a/test/cases/rlhc.d/case/curs1_c.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/curs1_c.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_c.c-C-F0--goto-backend.in b/test/rlhc.d/case/curs1_c.c-C-F0--goto-backend.in
index 5f77a38f..5f77a38f 100644
--- a/test/cases/rlhc.d/case/curs1_c.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/curs1_c.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_c.c-C-F0--var-backend.exp b/test/rlhc.d/case/curs1_c.c-C-F0--var-backend.exp
index 3532a605..3532a605 100644
--- a/test/cases/rlhc.d/case/curs1_c.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/curs1_c.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_c.c-C-F0--var-backend.in b/test/rlhc.d/case/curs1_c.c-C-F0--var-backend.in
index 50e1c026..50e1c026 100644
--- a/test/cases/rlhc.d/case/curs1_c.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/curs1_c.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_c.c-C-F1--goto-backend.exp b/test/rlhc.d/case/curs1_c.c-C-F1--goto-backend.exp
index 33dd20aa..33dd20aa 100644
--- a/test/cases/rlhc.d/case/curs1_c.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/curs1_c.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_c.c-C-F1--goto-backend.in b/test/rlhc.d/case/curs1_c.c-C-F1--goto-backend.in
index fc96d061..fc96d061 100644
--- a/test/cases/rlhc.d/case/curs1_c.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/curs1_c.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_c.c-C-F1--var-backend.exp b/test/rlhc.d/case/curs1_c.c-C-F1--var-backend.exp
index 38e03cd1..38e03cd1 100644
--- a/test/cases/rlhc.d/case/curs1_c.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/curs1_c.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_c.c-C-F1--var-backend.in b/test/rlhc.d/case/curs1_c.c-C-F1--var-backend.in
index 5d723174..5d723174 100644
--- a/test/cases/rlhc.d/case/curs1_c.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/curs1_c.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_c.c-C-G0--goto-backend.exp b/test/rlhc.d/case/curs1_c.c-C-G0--goto-backend.exp
index 4616be77..4616be77 100644
--- a/test/cases/rlhc.d/case/curs1_c.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/curs1_c.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_c.c-C-G0--goto-backend.in b/test/rlhc.d/case/curs1_c.c-C-G0--goto-backend.in
index 1656a61f..1656a61f 100644
--- a/test/cases/rlhc.d/case/curs1_c.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/curs1_c.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_c.c-C-G1--goto-backend.exp b/test/rlhc.d/case/curs1_c.c-C-G1--goto-backend.exp
index f62ab491..f62ab491 100644
--- a/test/cases/rlhc.d/case/curs1_c.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/curs1_c.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_c.c-C-G1--goto-backend.in b/test/rlhc.d/case/curs1_c.c-C-G1--goto-backend.in
index 3fdf1e36..3fdf1e36 100644
--- a/test/cases/rlhc.d/case/curs1_c.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/curs1_c.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_c.c-C-G2--goto-backend.exp b/test/rlhc.d/case/curs1_c.c-C-G2--goto-backend.exp
index 63a81b2e..63a81b2e 100644
--- a/test/cases/rlhc.d/case/curs1_c.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/curs1_c.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_c.c-C-G2--goto-backend.in b/test/rlhc.d/case/curs1_c.c-C-G2--goto-backend.in
index dc00f7e2..dc00f7e2 100644
--- a/test/cases/rlhc.d/case/curs1_c.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/curs1_c.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_c.c-C-T0--goto-backend.exp b/test/rlhc.d/case/curs1_c.c-C-T0--goto-backend.exp
index 713b2406..713b2406 100644
--- a/test/cases/rlhc.d/case/curs1_c.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/curs1_c.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_c.c-C-T0--goto-backend.in b/test/rlhc.d/case/curs1_c.c-C-T0--goto-backend.in
index baca92d8..baca92d8 100644
--- a/test/cases/rlhc.d/case/curs1_c.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/curs1_c.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_c.c-C-T0--var-backend.exp b/test/rlhc.d/case/curs1_c.c-C-T0--var-backend.exp
index 59b9ffa4..59b9ffa4 100644
--- a/test/cases/rlhc.d/case/curs1_c.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/curs1_c.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_c.c-C-T0--var-backend.in b/test/rlhc.d/case/curs1_c.c-C-T0--var-backend.in
index 3da8ec55..3da8ec55 100644
--- a/test/cases/rlhc.d/case/curs1_c.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/curs1_c.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_c.c-C-T1--goto-backend.exp b/test/rlhc.d/case/curs1_c.c-C-T1--goto-backend.exp
index 5288179c..5288179c 100644
--- a/test/cases/rlhc.d/case/curs1_c.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/curs1_c.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_c.c-C-T1--goto-backend.in b/test/rlhc.d/case/curs1_c.c-C-T1--goto-backend.in
index 95d1d0f6..95d1d0f6 100644
--- a/test/cases/rlhc.d/case/curs1_c.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/curs1_c.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_c.c-C-T1--var-backend.exp b/test/rlhc.d/case/curs1_c.c-C-T1--var-backend.exp
index 80ba0cc4..80ba0cc4 100644
--- a/test/cases/rlhc.d/case/curs1_c.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/curs1_c.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_c.c-C-T1--var-backend.in b/test/rlhc.d/case/curs1_c.c-C-T1--var-backend.in
index 22bc4cc4..22bc4cc4 100644
--- a/test/cases/rlhc.d/case/curs1_c.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/curs1_c.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_crack.crk-K-F0--var-backend.exp b/test/rlhc.d/case/curs1_crack.crk-K-F0--var-backend.exp
index 4d964152..4d964152 100644
--- a/test/cases/rlhc.d/case/curs1_crack.crk-K-F0--var-backend.exp
+++ b/test/rlhc.d/case/curs1_crack.crk-K-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_crack.crk-K-F0--var-backend.in b/test/rlhc.d/case/curs1_crack.crk-K-F0--var-backend.in
index 7b3faea4..7b3faea4 100644
--- a/test/cases/rlhc.d/case/curs1_crack.crk-K-F0--var-backend.in
+++ b/test/rlhc.d/case/curs1_crack.crk-K-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_crack.crk-K-F1--var-backend.exp b/test/rlhc.d/case/curs1_crack.crk-K-F1--var-backend.exp
index a32cecb7..a32cecb7 100644
--- a/test/cases/rlhc.d/case/curs1_crack.crk-K-F1--var-backend.exp
+++ b/test/rlhc.d/case/curs1_crack.crk-K-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_crack.crk-K-F1--var-backend.in b/test/rlhc.d/case/curs1_crack.crk-K-F1--var-backend.in
index 1cb8b3b9..1cb8b3b9 100644
--- a/test/cases/rlhc.d/case/curs1_crack.crk-K-F1--var-backend.in
+++ b/test/rlhc.d/case/curs1_crack.crk-K-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_crack.crk-K-T0--var-backend.exp b/test/rlhc.d/case/curs1_crack.crk-K-T0--var-backend.exp
index c94c764a..c94c764a 100644
--- a/test/cases/rlhc.d/case/curs1_crack.crk-K-T0--var-backend.exp
+++ b/test/rlhc.d/case/curs1_crack.crk-K-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_crack.crk-K-T0--var-backend.in b/test/rlhc.d/case/curs1_crack.crk-K-T0--var-backend.in
index 708be584..708be584 100644
--- a/test/cases/rlhc.d/case/curs1_crack.crk-K-T0--var-backend.in
+++ b/test/rlhc.d/case/curs1_crack.crk-K-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_crack.crk-K-T1--var-backend.exp b/test/rlhc.d/case/curs1_crack.crk-K-T1--var-backend.exp
index 7c0fc5cd..7c0fc5cd 100644
--- a/test/cases/rlhc.d/case/curs1_crack.crk-K-T1--var-backend.exp
+++ b/test/rlhc.d/case/curs1_crack.crk-K-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_crack.crk-K-T1--var-backend.in b/test/rlhc.d/case/curs1_crack.crk-K-T1--var-backend.in
index 03022cc4..03022cc4 100644
--- a/test/cases/rlhc.d/case/curs1_crack.crk-K-T1--var-backend.in
+++ b/test/rlhc.d/case/curs1_crack.crk-K-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_cs.cs-A-F0--goto-backend.exp b/test/rlhc.d/case/curs1_cs.cs-A-F0--goto-backend.exp
index 49115aa3..49115aa3 100644
--- a/test/cases/rlhc.d/case/curs1_cs.cs-A-F0--goto-backend.exp
+++ b/test/rlhc.d/case/curs1_cs.cs-A-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_cs.cs-A-F0--goto-backend.in b/test/rlhc.d/case/curs1_cs.cs-A-F0--goto-backend.in
index 1b73d89b..1b73d89b 100644
--- a/test/cases/rlhc.d/case/curs1_cs.cs-A-F0--goto-backend.in
+++ b/test/rlhc.d/case/curs1_cs.cs-A-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_cs.cs-A-F0--var-backend.exp b/test/rlhc.d/case/curs1_cs.cs-A-F0--var-backend.exp
index 0142d6ed..0142d6ed 100644
--- a/test/cases/rlhc.d/case/curs1_cs.cs-A-F0--var-backend.exp
+++ b/test/rlhc.d/case/curs1_cs.cs-A-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_cs.cs-A-F0--var-backend.in b/test/rlhc.d/case/curs1_cs.cs-A-F0--var-backend.in
index ce28c197..ce28c197 100644
--- a/test/cases/rlhc.d/case/curs1_cs.cs-A-F0--var-backend.in
+++ b/test/rlhc.d/case/curs1_cs.cs-A-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_cs.cs-A-F1--goto-backend.exp b/test/rlhc.d/case/curs1_cs.cs-A-F1--goto-backend.exp
index df3f1b1b..df3f1b1b 100644
--- a/test/cases/rlhc.d/case/curs1_cs.cs-A-F1--goto-backend.exp
+++ b/test/rlhc.d/case/curs1_cs.cs-A-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_cs.cs-A-F1--goto-backend.in b/test/rlhc.d/case/curs1_cs.cs-A-F1--goto-backend.in
index e7ff474b..e7ff474b 100644
--- a/test/cases/rlhc.d/case/curs1_cs.cs-A-F1--goto-backend.in
+++ b/test/rlhc.d/case/curs1_cs.cs-A-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_cs.cs-A-F1--var-backend.exp b/test/rlhc.d/case/curs1_cs.cs-A-F1--var-backend.exp
index b159ef60..b159ef60 100644
--- a/test/cases/rlhc.d/case/curs1_cs.cs-A-F1--var-backend.exp
+++ b/test/rlhc.d/case/curs1_cs.cs-A-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_cs.cs-A-F1--var-backend.in b/test/rlhc.d/case/curs1_cs.cs-A-F1--var-backend.in
index 25ce0f5f..25ce0f5f 100644
--- a/test/cases/rlhc.d/case/curs1_cs.cs-A-F1--var-backend.in
+++ b/test/rlhc.d/case/curs1_cs.cs-A-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_cs.cs-A-G0--goto-backend.exp b/test/rlhc.d/case/curs1_cs.cs-A-G0--goto-backend.exp
index b553f04c..b553f04c 100644
--- a/test/cases/rlhc.d/case/curs1_cs.cs-A-G0--goto-backend.exp
+++ b/test/rlhc.d/case/curs1_cs.cs-A-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_cs.cs-A-G0--goto-backend.in b/test/rlhc.d/case/curs1_cs.cs-A-G0--goto-backend.in
index b428e158..b428e158 100644
--- a/test/cases/rlhc.d/case/curs1_cs.cs-A-G0--goto-backend.in
+++ b/test/rlhc.d/case/curs1_cs.cs-A-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_cs.cs-A-G1--goto-backend.exp b/test/rlhc.d/case/curs1_cs.cs-A-G1--goto-backend.exp
index e79e9f15..e79e9f15 100644
--- a/test/cases/rlhc.d/case/curs1_cs.cs-A-G1--goto-backend.exp
+++ b/test/rlhc.d/case/curs1_cs.cs-A-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_cs.cs-A-G1--goto-backend.in b/test/rlhc.d/case/curs1_cs.cs-A-G1--goto-backend.in
index 9b8fb7fb..9b8fb7fb 100644
--- a/test/cases/rlhc.d/case/curs1_cs.cs-A-G1--goto-backend.in
+++ b/test/rlhc.d/case/curs1_cs.cs-A-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_cs.cs-A-T0--goto-backend.exp b/test/rlhc.d/case/curs1_cs.cs-A-T0--goto-backend.exp
index 78bd5626..78bd5626 100644
--- a/test/cases/rlhc.d/case/curs1_cs.cs-A-T0--goto-backend.exp
+++ b/test/rlhc.d/case/curs1_cs.cs-A-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_cs.cs-A-T0--goto-backend.in b/test/rlhc.d/case/curs1_cs.cs-A-T0--goto-backend.in
index 63199d4d..63199d4d 100644
--- a/test/cases/rlhc.d/case/curs1_cs.cs-A-T0--goto-backend.in
+++ b/test/rlhc.d/case/curs1_cs.cs-A-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_cs.cs-A-T0--var-backend.exp b/test/rlhc.d/case/curs1_cs.cs-A-T0--var-backend.exp
index 21b23438..21b23438 100644
--- a/test/cases/rlhc.d/case/curs1_cs.cs-A-T0--var-backend.exp
+++ b/test/rlhc.d/case/curs1_cs.cs-A-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_cs.cs-A-T0--var-backend.in b/test/rlhc.d/case/curs1_cs.cs-A-T0--var-backend.in
index 587e09c5..587e09c5 100644
--- a/test/cases/rlhc.d/case/curs1_cs.cs-A-T0--var-backend.in
+++ b/test/rlhc.d/case/curs1_cs.cs-A-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_cs.cs-A-T1--goto-backend.exp b/test/rlhc.d/case/curs1_cs.cs-A-T1--goto-backend.exp
index c8d128ba..c8d128ba 100644
--- a/test/cases/rlhc.d/case/curs1_cs.cs-A-T1--goto-backend.exp
+++ b/test/rlhc.d/case/curs1_cs.cs-A-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_cs.cs-A-T1--goto-backend.in b/test/rlhc.d/case/curs1_cs.cs-A-T1--goto-backend.in
index d321de52..d321de52 100644
--- a/test/cases/rlhc.d/case/curs1_cs.cs-A-T1--goto-backend.in
+++ b/test/rlhc.d/case/curs1_cs.cs-A-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_cs.cs-A-T1--var-backend.exp b/test/rlhc.d/case/curs1_cs.cs-A-T1--var-backend.exp
index 21c7d146..21c7d146 100644
--- a/test/cases/rlhc.d/case/curs1_cs.cs-A-T1--var-backend.exp
+++ b/test/rlhc.d/case/curs1_cs.cs-A-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_cs.cs-A-T1--var-backend.in b/test/rlhc.d/case/curs1_cs.cs-A-T1--var-backend.in
index a6b71daf..a6b71daf 100644
--- a/test/cases/rlhc.d/case/curs1_cs.cs-A-T1--var-backend.in
+++ b/test/rlhc.d/case/curs1_cs.cs-A-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_go.go-Z-F0--goto-backend.exp b/test/rlhc.d/case/curs1_go.go-Z-F0--goto-backend.exp
index 55697752..55697752 100644
--- a/test/cases/rlhc.d/case/curs1_go.go-Z-F0--goto-backend.exp
+++ b/test/rlhc.d/case/curs1_go.go-Z-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_go.go-Z-F0--goto-backend.in b/test/rlhc.d/case/curs1_go.go-Z-F0--goto-backend.in
index d744284b..d744284b 100644
--- a/test/cases/rlhc.d/case/curs1_go.go-Z-F0--goto-backend.in
+++ b/test/rlhc.d/case/curs1_go.go-Z-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_go.go-Z-F0--var-backend.exp b/test/rlhc.d/case/curs1_go.go-Z-F0--var-backend.exp
index 4d6d5108..4d6d5108 100644
--- a/test/cases/rlhc.d/case/curs1_go.go-Z-F0--var-backend.exp
+++ b/test/rlhc.d/case/curs1_go.go-Z-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_go.go-Z-F0--var-backend.in b/test/rlhc.d/case/curs1_go.go-Z-F0--var-backend.in
index ad6adb7e..ad6adb7e 100644
--- a/test/cases/rlhc.d/case/curs1_go.go-Z-F0--var-backend.in
+++ b/test/rlhc.d/case/curs1_go.go-Z-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_go.go-Z-F1--goto-backend.exp b/test/rlhc.d/case/curs1_go.go-Z-F1--goto-backend.exp
index c1d6d800..c1d6d800 100644
--- a/test/cases/rlhc.d/case/curs1_go.go-Z-F1--goto-backend.exp
+++ b/test/rlhc.d/case/curs1_go.go-Z-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_go.go-Z-F1--goto-backend.in b/test/rlhc.d/case/curs1_go.go-Z-F1--goto-backend.in
index 5cb9dfa7..5cb9dfa7 100644
--- a/test/cases/rlhc.d/case/curs1_go.go-Z-F1--goto-backend.in
+++ b/test/rlhc.d/case/curs1_go.go-Z-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_go.go-Z-F1--var-backend.exp b/test/rlhc.d/case/curs1_go.go-Z-F1--var-backend.exp
index 56d45e80..56d45e80 100644
--- a/test/cases/rlhc.d/case/curs1_go.go-Z-F1--var-backend.exp
+++ b/test/rlhc.d/case/curs1_go.go-Z-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_go.go-Z-F1--var-backend.in b/test/rlhc.d/case/curs1_go.go-Z-F1--var-backend.in
index 6fbfb423..6fbfb423 100644
--- a/test/cases/rlhc.d/case/curs1_go.go-Z-F1--var-backend.in
+++ b/test/rlhc.d/case/curs1_go.go-Z-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_go.go-Z-G0--goto-backend.exp b/test/rlhc.d/case/curs1_go.go-Z-G0--goto-backend.exp
index 4616fc2d..4616fc2d 100644
--- a/test/cases/rlhc.d/case/curs1_go.go-Z-G0--goto-backend.exp
+++ b/test/rlhc.d/case/curs1_go.go-Z-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_go.go-Z-G0--goto-backend.in b/test/rlhc.d/case/curs1_go.go-Z-G0--goto-backend.in
index a82ec48a..a82ec48a 100644
--- a/test/cases/rlhc.d/case/curs1_go.go-Z-G0--goto-backend.in
+++ b/test/rlhc.d/case/curs1_go.go-Z-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_go.go-Z-G1--goto-backend.exp b/test/rlhc.d/case/curs1_go.go-Z-G1--goto-backend.exp
index dcdfba4d..dcdfba4d 100644
--- a/test/cases/rlhc.d/case/curs1_go.go-Z-G1--goto-backend.exp
+++ b/test/rlhc.d/case/curs1_go.go-Z-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_go.go-Z-G1--goto-backend.in b/test/rlhc.d/case/curs1_go.go-Z-G1--goto-backend.in
index 3fce31e3..3fce31e3 100644
--- a/test/cases/rlhc.d/case/curs1_go.go-Z-G1--goto-backend.in
+++ b/test/rlhc.d/case/curs1_go.go-Z-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_go.go-Z-G2--goto-backend.exp b/test/rlhc.d/case/curs1_go.go-Z-G2--goto-backend.exp
index 14edbcd7..14edbcd7 100644
--- a/test/cases/rlhc.d/case/curs1_go.go-Z-G2--goto-backend.exp
+++ b/test/rlhc.d/case/curs1_go.go-Z-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_go.go-Z-G2--goto-backend.in b/test/rlhc.d/case/curs1_go.go-Z-G2--goto-backend.in
index a20db1a1..a20db1a1 100644
--- a/test/cases/rlhc.d/case/curs1_go.go-Z-G2--goto-backend.in
+++ b/test/rlhc.d/case/curs1_go.go-Z-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_go.go-Z-T0--goto-backend.exp b/test/rlhc.d/case/curs1_go.go-Z-T0--goto-backend.exp
index 52890e2f..52890e2f 100644
--- a/test/cases/rlhc.d/case/curs1_go.go-Z-T0--goto-backend.exp
+++ b/test/rlhc.d/case/curs1_go.go-Z-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_go.go-Z-T0--goto-backend.in b/test/rlhc.d/case/curs1_go.go-Z-T0--goto-backend.in
index c2d8c705..c2d8c705 100644
--- a/test/cases/rlhc.d/case/curs1_go.go-Z-T0--goto-backend.in
+++ b/test/rlhc.d/case/curs1_go.go-Z-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_go.go-Z-T0--var-backend.exp b/test/rlhc.d/case/curs1_go.go-Z-T0--var-backend.exp
index 7ff17800..7ff17800 100644
--- a/test/cases/rlhc.d/case/curs1_go.go-Z-T0--var-backend.exp
+++ b/test/rlhc.d/case/curs1_go.go-Z-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_go.go-Z-T0--var-backend.in b/test/rlhc.d/case/curs1_go.go-Z-T0--var-backend.in
index 65ae0e12..65ae0e12 100644
--- a/test/cases/rlhc.d/case/curs1_go.go-Z-T0--var-backend.in
+++ b/test/rlhc.d/case/curs1_go.go-Z-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_go.go-Z-T1--goto-backend.exp b/test/rlhc.d/case/curs1_go.go-Z-T1--goto-backend.exp
index 5a092974..5a092974 100644
--- a/test/cases/rlhc.d/case/curs1_go.go-Z-T1--goto-backend.exp
+++ b/test/rlhc.d/case/curs1_go.go-Z-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_go.go-Z-T1--goto-backend.in b/test/rlhc.d/case/curs1_go.go-Z-T1--goto-backend.in
index 96b26358..96b26358 100644
--- a/test/cases/rlhc.d/case/curs1_go.go-Z-T1--goto-backend.in
+++ b/test/rlhc.d/case/curs1_go.go-Z-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_go.go-Z-T1--var-backend.exp b/test/rlhc.d/case/curs1_go.go-Z-T1--var-backend.exp
index a2522782..a2522782 100644
--- a/test/cases/rlhc.d/case/curs1_go.go-Z-T1--var-backend.exp
+++ b/test/rlhc.d/case/curs1_go.go-Z-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_go.go-Z-T1--var-backend.in b/test/rlhc.d/case/curs1_go.go-Z-T1--var-backend.in
index 63a98288..63a98288 100644
--- a/test/cases/rlhc.d/case/curs1_go.go-Z-T1--var-backend.in
+++ b/test/rlhc.d/case/curs1_go.go-Z-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_java.java-J-F0--goto-backend.exp b/test/rlhc.d/case/curs1_java.java-J-F0--goto-backend.exp
index 1676ec46..1676ec46 100644
--- a/test/cases/rlhc.d/case/curs1_java.java-J-F0--goto-backend.exp
+++ b/test/rlhc.d/case/curs1_java.java-J-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_java.java-J-F0--goto-backend.in b/test/rlhc.d/case/curs1_java.java-J-F0--goto-backend.in
index 9403800a..9403800a 100644
--- a/test/cases/rlhc.d/case/curs1_java.java-J-F0--goto-backend.in
+++ b/test/rlhc.d/case/curs1_java.java-J-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_java.java-J-F0--var-backend.exp b/test/rlhc.d/case/curs1_java.java-J-F0--var-backend.exp
index de7bd1b3..de7bd1b3 100644
--- a/test/cases/rlhc.d/case/curs1_java.java-J-F0--var-backend.exp
+++ b/test/rlhc.d/case/curs1_java.java-J-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_java.java-J-F0--var-backend.in b/test/rlhc.d/case/curs1_java.java-J-F0--var-backend.in
index 89996615..89996615 100644
--- a/test/cases/rlhc.d/case/curs1_java.java-J-F0--var-backend.in
+++ b/test/rlhc.d/case/curs1_java.java-J-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_java.java-J-F1--goto-backend.exp b/test/rlhc.d/case/curs1_java.java-J-F1--goto-backend.exp
index 4fa80f35..4fa80f35 100644
--- a/test/cases/rlhc.d/case/curs1_java.java-J-F1--goto-backend.exp
+++ b/test/rlhc.d/case/curs1_java.java-J-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_java.java-J-F1--goto-backend.in b/test/rlhc.d/case/curs1_java.java-J-F1--goto-backend.in
index ad0a03ad..ad0a03ad 100644
--- a/test/cases/rlhc.d/case/curs1_java.java-J-F1--goto-backend.in
+++ b/test/rlhc.d/case/curs1_java.java-J-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_java.java-J-F1--var-backend.exp b/test/rlhc.d/case/curs1_java.java-J-F1--var-backend.exp
index 6c77d21b..6c77d21b 100644
--- a/test/cases/rlhc.d/case/curs1_java.java-J-F1--var-backend.exp
+++ b/test/rlhc.d/case/curs1_java.java-J-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_java.java-J-F1--var-backend.in b/test/rlhc.d/case/curs1_java.java-J-F1--var-backend.in
index 4be32e9e..4be32e9e 100644
--- a/test/cases/rlhc.d/case/curs1_java.java-J-F1--var-backend.in
+++ b/test/rlhc.d/case/curs1_java.java-J-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_java.java-J-T0--goto-backend.exp b/test/rlhc.d/case/curs1_java.java-J-T0--goto-backend.exp
index c1c81a47..c1c81a47 100644
--- a/test/cases/rlhc.d/case/curs1_java.java-J-T0--goto-backend.exp
+++ b/test/rlhc.d/case/curs1_java.java-J-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_java.java-J-T0--goto-backend.in b/test/rlhc.d/case/curs1_java.java-J-T0--goto-backend.in
index 4a657b4c..4a657b4c 100644
--- a/test/cases/rlhc.d/case/curs1_java.java-J-T0--goto-backend.in
+++ b/test/rlhc.d/case/curs1_java.java-J-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_java.java-J-T0--var-backend.exp b/test/rlhc.d/case/curs1_java.java-J-T0--var-backend.exp
index e6b17427..e6b17427 100644
--- a/test/cases/rlhc.d/case/curs1_java.java-J-T0--var-backend.exp
+++ b/test/rlhc.d/case/curs1_java.java-J-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_java.java-J-T0--var-backend.in b/test/rlhc.d/case/curs1_java.java-J-T0--var-backend.in
index 6bea0916..6bea0916 100644
--- a/test/cases/rlhc.d/case/curs1_java.java-J-T0--var-backend.in
+++ b/test/rlhc.d/case/curs1_java.java-J-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_java.java-J-T1--goto-backend.exp b/test/rlhc.d/case/curs1_java.java-J-T1--goto-backend.exp
index f16970bd..f16970bd 100644
--- a/test/cases/rlhc.d/case/curs1_java.java-J-T1--goto-backend.exp
+++ b/test/rlhc.d/case/curs1_java.java-J-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_java.java-J-T1--goto-backend.in b/test/rlhc.d/case/curs1_java.java-J-T1--goto-backend.in
index a79b882e..a79b882e 100644
--- a/test/cases/rlhc.d/case/curs1_java.java-J-T1--goto-backend.in
+++ b/test/rlhc.d/case/curs1_java.java-J-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_java.java-J-T1--var-backend.exp b/test/rlhc.d/case/curs1_java.java-J-T1--var-backend.exp
index 0c2472bd..0c2472bd 100644
--- a/test/cases/rlhc.d/case/curs1_java.java-J-T1--var-backend.exp
+++ b/test/rlhc.d/case/curs1_java.java-J-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_java.java-J-T1--var-backend.in b/test/rlhc.d/case/curs1_java.java-J-T1--var-backend.in
index 51541d38..51541d38 100644
--- a/test/cases/rlhc.d/case/curs1_java.java-J-T1--var-backend.in
+++ b/test/rlhc.d/case/curs1_java.java-J-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_julia.jl-Y-F0--var-backend.exp b/test/rlhc.d/case/curs1_julia.jl-Y-F0--var-backend.exp
index 70be9828..70be9828 100644
--- a/test/cases/rlhc.d/case/curs1_julia.jl-Y-F0--var-backend.exp
+++ b/test/rlhc.d/case/curs1_julia.jl-Y-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_julia.jl-Y-F0--var-backend.in b/test/rlhc.d/case/curs1_julia.jl-Y-F0--var-backend.in
index 58abc9de..58abc9de 100644
--- a/test/cases/rlhc.d/case/curs1_julia.jl-Y-F0--var-backend.in
+++ b/test/rlhc.d/case/curs1_julia.jl-Y-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_julia.jl-Y-F1--var-backend.exp b/test/rlhc.d/case/curs1_julia.jl-Y-F1--var-backend.exp
index 9e2cabc1..9e2cabc1 100644
--- a/test/cases/rlhc.d/case/curs1_julia.jl-Y-F1--var-backend.exp
+++ b/test/rlhc.d/case/curs1_julia.jl-Y-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_julia.jl-Y-F1--var-backend.in b/test/rlhc.d/case/curs1_julia.jl-Y-F1--var-backend.in
index fe0cb5dd..fe0cb5dd 100644
--- a/test/cases/rlhc.d/case/curs1_julia.jl-Y-F1--var-backend.in
+++ b/test/rlhc.d/case/curs1_julia.jl-Y-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_julia.jl-Y-T0--var-backend.exp b/test/rlhc.d/case/curs1_julia.jl-Y-T0--var-backend.exp
index 755cbd53..755cbd53 100644
--- a/test/cases/rlhc.d/case/curs1_julia.jl-Y-T0--var-backend.exp
+++ b/test/rlhc.d/case/curs1_julia.jl-Y-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_julia.jl-Y-T0--var-backend.in b/test/rlhc.d/case/curs1_julia.jl-Y-T0--var-backend.in
index 4a00e95e..4a00e95e 100644
--- a/test/cases/rlhc.d/case/curs1_julia.jl-Y-T0--var-backend.in
+++ b/test/rlhc.d/case/curs1_julia.jl-Y-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_julia.jl-Y-T1--var-backend.exp b/test/rlhc.d/case/curs1_julia.jl-Y-T1--var-backend.exp
index 7353ee1a..7353ee1a 100644
--- a/test/cases/rlhc.d/case/curs1_julia.jl-Y-T1--var-backend.exp
+++ b/test/rlhc.d/case/curs1_julia.jl-Y-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_julia.jl-Y-T1--var-backend.in b/test/rlhc.d/case/curs1_julia.jl-Y-T1--var-backend.in
index ccd3ad6a..ccd3ad6a 100644
--- a/test/cases/rlhc.d/case/curs1_julia.jl-Y-T1--var-backend.in
+++ b/test/rlhc.d/case/curs1_julia.jl-Y-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_ocaml.ml-O-F0--var-backend.exp b/test/rlhc.d/case/curs1_ocaml.ml-O-F0--var-backend.exp
index 2d73ae16..2d73ae16 100644
--- a/test/cases/rlhc.d/case/curs1_ocaml.ml-O-F0--var-backend.exp
+++ b/test/rlhc.d/case/curs1_ocaml.ml-O-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_ocaml.ml-O-F0--var-backend.in b/test/rlhc.d/case/curs1_ocaml.ml-O-F0--var-backend.in
index fcf5976f..fcf5976f 100644
--- a/test/cases/rlhc.d/case/curs1_ocaml.ml-O-F0--var-backend.in
+++ b/test/rlhc.d/case/curs1_ocaml.ml-O-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_ocaml.ml-O-F1--var-backend.exp b/test/rlhc.d/case/curs1_ocaml.ml-O-F1--var-backend.exp
index 64af87a9..64af87a9 100644
--- a/test/cases/rlhc.d/case/curs1_ocaml.ml-O-F1--var-backend.exp
+++ b/test/rlhc.d/case/curs1_ocaml.ml-O-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_ocaml.ml-O-F1--var-backend.in b/test/rlhc.d/case/curs1_ocaml.ml-O-F1--var-backend.in
index 694bdbc3..694bdbc3 100644
--- a/test/cases/rlhc.d/case/curs1_ocaml.ml-O-F1--var-backend.in
+++ b/test/rlhc.d/case/curs1_ocaml.ml-O-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_ocaml.ml-O-T0--var-backend.exp b/test/rlhc.d/case/curs1_ocaml.ml-O-T0--var-backend.exp
index ca74b3ff..ca74b3ff 100644
--- a/test/cases/rlhc.d/case/curs1_ocaml.ml-O-T0--var-backend.exp
+++ b/test/rlhc.d/case/curs1_ocaml.ml-O-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_ocaml.ml-O-T0--var-backend.in b/test/rlhc.d/case/curs1_ocaml.ml-O-T0--var-backend.in
index 76de9c09..76de9c09 100644
--- a/test/cases/rlhc.d/case/curs1_ocaml.ml-O-T0--var-backend.in
+++ b/test/rlhc.d/case/curs1_ocaml.ml-O-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_ocaml.ml-O-T1--var-backend.exp b/test/rlhc.d/case/curs1_ocaml.ml-O-T1--var-backend.exp
index 45d7923a..45d7923a 100644
--- a/test/cases/rlhc.d/case/curs1_ocaml.ml-O-T1--var-backend.exp
+++ b/test/rlhc.d/case/curs1_ocaml.ml-O-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_ocaml.ml-O-T1--var-backend.in b/test/rlhc.d/case/curs1_ocaml.ml-O-T1--var-backend.in
index 78f91038..78f91038 100644
--- a/test/cases/rlhc.d/case/curs1_ocaml.ml-O-T1--var-backend.in
+++ b/test/rlhc.d/case/curs1_ocaml.ml-O-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_ruby.rb-R-F0--var-backend.exp b/test/rlhc.d/case/curs1_ruby.rb-R-F0--var-backend.exp
index 245c52c5..245c52c5 100644
--- a/test/cases/rlhc.d/case/curs1_ruby.rb-R-F0--var-backend.exp
+++ b/test/rlhc.d/case/curs1_ruby.rb-R-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_ruby.rb-R-F0--var-backend.in b/test/rlhc.d/case/curs1_ruby.rb-R-F0--var-backend.in
index ba5b7790..ba5b7790 100644
--- a/test/cases/rlhc.d/case/curs1_ruby.rb-R-F0--var-backend.in
+++ b/test/rlhc.d/case/curs1_ruby.rb-R-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_ruby.rb-R-F1--var-backend.exp b/test/rlhc.d/case/curs1_ruby.rb-R-F1--var-backend.exp
index 2d338669..2d338669 100644
--- a/test/cases/rlhc.d/case/curs1_ruby.rb-R-F1--var-backend.exp
+++ b/test/rlhc.d/case/curs1_ruby.rb-R-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_ruby.rb-R-F1--var-backend.in b/test/rlhc.d/case/curs1_ruby.rb-R-F1--var-backend.in
index 6e979162..6e979162 100644
--- a/test/cases/rlhc.d/case/curs1_ruby.rb-R-F1--var-backend.in
+++ b/test/rlhc.d/case/curs1_ruby.rb-R-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_ruby.rb-R-T0--var-backend.exp b/test/rlhc.d/case/curs1_ruby.rb-R-T0--var-backend.exp
index ddfd7e7d..ddfd7e7d 100644
--- a/test/cases/rlhc.d/case/curs1_ruby.rb-R-T0--var-backend.exp
+++ b/test/rlhc.d/case/curs1_ruby.rb-R-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_ruby.rb-R-T0--var-backend.in b/test/rlhc.d/case/curs1_ruby.rb-R-T0--var-backend.in
index dbcc8189..dbcc8189 100644
--- a/test/cases/rlhc.d/case/curs1_ruby.rb-R-T0--var-backend.in
+++ b/test/rlhc.d/case/curs1_ruby.rb-R-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_ruby.rb-R-T1--var-backend.exp b/test/rlhc.d/case/curs1_ruby.rb-R-T1--var-backend.exp
index e278a80c..e278a80c 100644
--- a/test/cases/rlhc.d/case/curs1_ruby.rb-R-T1--var-backend.exp
+++ b/test/rlhc.d/case/curs1_ruby.rb-R-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_ruby.rb-R-T1--var-backend.in b/test/rlhc.d/case/curs1_ruby.rb-R-T1--var-backend.in
index 7cbde085..7cbde085 100644
--- a/test/cases/rlhc.d/case/curs1_ruby.rb-R-T1--var-backend.in
+++ b/test/rlhc.d/case/curs1_ruby.rb-R-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_rust.rs-U-F0--var-backend.exp b/test/rlhc.d/case/curs1_rust.rs-U-F0--var-backend.exp
index 9fb315ab..9fb315ab 100644
--- a/test/cases/rlhc.d/case/curs1_rust.rs-U-F0--var-backend.exp
+++ b/test/rlhc.d/case/curs1_rust.rs-U-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_rust.rs-U-F0--var-backend.in b/test/rlhc.d/case/curs1_rust.rs-U-F0--var-backend.in
index 8397892c..8397892c 100644
--- a/test/cases/rlhc.d/case/curs1_rust.rs-U-F0--var-backend.in
+++ b/test/rlhc.d/case/curs1_rust.rs-U-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_rust.rs-U-F1--var-backend.exp b/test/rlhc.d/case/curs1_rust.rs-U-F1--var-backend.exp
index 6ef2c51f..6ef2c51f 100644
--- a/test/cases/rlhc.d/case/curs1_rust.rs-U-F1--var-backend.exp
+++ b/test/rlhc.d/case/curs1_rust.rs-U-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_rust.rs-U-F1--var-backend.in b/test/rlhc.d/case/curs1_rust.rs-U-F1--var-backend.in
index 5840848b..5840848b 100644
--- a/test/cases/rlhc.d/case/curs1_rust.rs-U-F1--var-backend.in
+++ b/test/rlhc.d/case/curs1_rust.rs-U-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_rust.rs-U-T0--var-backend.exp b/test/rlhc.d/case/curs1_rust.rs-U-T0--var-backend.exp
index db5dc40e..db5dc40e 100644
--- a/test/cases/rlhc.d/case/curs1_rust.rs-U-T0--var-backend.exp
+++ b/test/rlhc.d/case/curs1_rust.rs-U-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_rust.rs-U-T0--var-backend.in b/test/rlhc.d/case/curs1_rust.rs-U-T0--var-backend.in
index f8765c2b..f8765c2b 100644
--- a/test/cases/rlhc.d/case/curs1_rust.rs-U-T0--var-backend.in
+++ b/test/rlhc.d/case/curs1_rust.rs-U-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/curs1_rust.rs-U-T1--var-backend.exp b/test/rlhc.d/case/curs1_rust.rs-U-T1--var-backend.exp
index d48e9ecd..d48e9ecd 100644
--- a/test/cases/rlhc.d/case/curs1_rust.rs-U-T1--var-backend.exp
+++ b/test/rlhc.d/case/curs1_rust.rs-U-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/curs1_rust.rs-U-T1--var-backend.in b/test/rlhc.d/case/curs1_rust.rs-U-T1--var-backend.in
index b441bec4..b441bec4 100644
--- a/test/cases/rlhc.d/case/curs1_rust.rs-U-T1--var-backend.in
+++ b/test/rlhc.d/case/curs1_rust.rs-U-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/element1.cpp-C-F0--goto-backend.exp b/test/rlhc.d/case/element1.cpp-C-F0--goto-backend.exp
index 921a4d74..921a4d74 100644
--- a/test/cases/rlhc.d/case/element1.cpp-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/element1.cpp-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/element1.cpp-C-F0--goto-backend.in b/test/rlhc.d/case/element1.cpp-C-F0--goto-backend.in
index ec6fe684..ec6fe684 100644
--- a/test/cases/rlhc.d/case/element1.cpp-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/element1.cpp-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/element1.cpp-C-F0--var-backend.exp b/test/rlhc.d/case/element1.cpp-C-F0--var-backend.exp
index 11502c5e..11502c5e 100644
--- a/test/cases/rlhc.d/case/element1.cpp-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/element1.cpp-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/element1.cpp-C-F0--var-backend.in b/test/rlhc.d/case/element1.cpp-C-F0--var-backend.in
index 4901854e..4901854e 100644
--- a/test/cases/rlhc.d/case/element1.cpp-C-F0--var-backend.in
+++ b/test/rlhc.d/case/element1.cpp-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/element1.cpp-C-F1--goto-backend.exp b/test/rlhc.d/case/element1.cpp-C-F1--goto-backend.exp
index 9e790602..9e790602 100644
--- a/test/cases/rlhc.d/case/element1.cpp-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/element1.cpp-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/element1.cpp-C-F1--goto-backend.in b/test/rlhc.d/case/element1.cpp-C-F1--goto-backend.in
index 5b6b09dc..5b6b09dc 100644
--- a/test/cases/rlhc.d/case/element1.cpp-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/element1.cpp-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/element1.cpp-C-F1--var-backend.exp b/test/rlhc.d/case/element1.cpp-C-F1--var-backend.exp
index b3c7ef49..b3c7ef49 100644
--- a/test/cases/rlhc.d/case/element1.cpp-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/element1.cpp-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/element1.cpp-C-F1--var-backend.in b/test/rlhc.d/case/element1.cpp-C-F1--var-backend.in
index 65005ac7..65005ac7 100644
--- a/test/cases/rlhc.d/case/element1.cpp-C-F1--var-backend.in
+++ b/test/rlhc.d/case/element1.cpp-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/element1.cpp-C-G0--goto-backend.exp b/test/rlhc.d/case/element1.cpp-C-G0--goto-backend.exp
index cfb28333..cfb28333 100644
--- a/test/cases/rlhc.d/case/element1.cpp-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/element1.cpp-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/element1.cpp-C-G0--goto-backend.in b/test/rlhc.d/case/element1.cpp-C-G0--goto-backend.in
index 3eb4b1f4..3eb4b1f4 100644
--- a/test/cases/rlhc.d/case/element1.cpp-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/element1.cpp-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/element1.cpp-C-G1--goto-backend.exp b/test/rlhc.d/case/element1.cpp-C-G1--goto-backend.exp
index 8d74134f..8d74134f 100644
--- a/test/cases/rlhc.d/case/element1.cpp-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/element1.cpp-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/element1.cpp-C-G1--goto-backend.in b/test/rlhc.d/case/element1.cpp-C-G1--goto-backend.in
index 97dff9fe..97dff9fe 100644
--- a/test/cases/rlhc.d/case/element1.cpp-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/element1.cpp-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/element1.cpp-C-G2--goto-backend.exp b/test/rlhc.d/case/element1.cpp-C-G2--goto-backend.exp
index acb46512..acb46512 100644
--- a/test/cases/rlhc.d/case/element1.cpp-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/element1.cpp-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/element1.cpp-C-G2--goto-backend.in b/test/rlhc.d/case/element1.cpp-C-G2--goto-backend.in
index aea99146..aea99146 100644
--- a/test/cases/rlhc.d/case/element1.cpp-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/element1.cpp-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/element1.cpp-C-T0--goto-backend.exp b/test/rlhc.d/case/element1.cpp-C-T0--goto-backend.exp
index 71f3666b..71f3666b 100644
--- a/test/cases/rlhc.d/case/element1.cpp-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/element1.cpp-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/element1.cpp-C-T0--goto-backend.in b/test/rlhc.d/case/element1.cpp-C-T0--goto-backend.in
index 89d27d70..89d27d70 100644
--- a/test/cases/rlhc.d/case/element1.cpp-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/element1.cpp-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/element1.cpp-C-T0--var-backend.exp b/test/rlhc.d/case/element1.cpp-C-T0--var-backend.exp
index 17e1297e..17e1297e 100644
--- a/test/cases/rlhc.d/case/element1.cpp-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/element1.cpp-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/element1.cpp-C-T0--var-backend.in b/test/rlhc.d/case/element1.cpp-C-T0--var-backend.in
index 29f85815..29f85815 100644
--- a/test/cases/rlhc.d/case/element1.cpp-C-T0--var-backend.in
+++ b/test/rlhc.d/case/element1.cpp-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/element1.cpp-C-T1--goto-backend.exp b/test/rlhc.d/case/element1.cpp-C-T1--goto-backend.exp
index c1e8495c..c1e8495c 100644
--- a/test/cases/rlhc.d/case/element1.cpp-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/element1.cpp-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/element1.cpp-C-T1--goto-backend.in b/test/rlhc.d/case/element1.cpp-C-T1--goto-backend.in
index f14792a5..f14792a5 100644
--- a/test/cases/rlhc.d/case/element1.cpp-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/element1.cpp-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/element1.cpp-C-T1--var-backend.exp b/test/rlhc.d/case/element1.cpp-C-T1--var-backend.exp
index f242e041..f242e041 100644
--- a/test/cases/rlhc.d/case/element1.cpp-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/element1.cpp-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/element1.cpp-C-T1--var-backend.in b/test/rlhc.d/case/element1.cpp-C-T1--var-backend.in
index 190197f7..190197f7 100644
--- a/test/cases/rlhc.d/case/element1.cpp-C-T1--var-backend.in
+++ b/test/rlhc.d/case/element1.cpp-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/element2.c-C-F0--goto-backend.exp b/test/rlhc.d/case/element2.c-C-F0--goto-backend.exp
index 7687b138..7687b138 100644
--- a/test/cases/rlhc.d/case/element2.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/element2.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/element2.c-C-F0--goto-backend.in b/test/rlhc.d/case/element2.c-C-F0--goto-backend.in
index 51b4260a..51b4260a 100644
--- a/test/cases/rlhc.d/case/element2.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/element2.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/element2.c-C-F0--var-backend.exp b/test/rlhc.d/case/element2.c-C-F0--var-backend.exp
index d62f3e31..d62f3e31 100644
--- a/test/cases/rlhc.d/case/element2.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/element2.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/element2.c-C-F0--var-backend.in b/test/rlhc.d/case/element2.c-C-F0--var-backend.in
index d5d58857..d5d58857 100644
--- a/test/cases/rlhc.d/case/element2.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/element2.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/element2.c-C-F1--goto-backend.exp b/test/rlhc.d/case/element2.c-C-F1--goto-backend.exp
index 92958a92..92958a92 100644
--- a/test/cases/rlhc.d/case/element2.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/element2.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/element2.c-C-F1--goto-backend.in b/test/rlhc.d/case/element2.c-C-F1--goto-backend.in
index 8140240c..8140240c 100644
--- a/test/cases/rlhc.d/case/element2.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/element2.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/element2.c-C-F1--var-backend.exp b/test/rlhc.d/case/element2.c-C-F1--var-backend.exp
index 70aee120..70aee120 100644
--- a/test/cases/rlhc.d/case/element2.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/element2.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/element2.c-C-F1--var-backend.in b/test/rlhc.d/case/element2.c-C-F1--var-backend.in
index 73be55f0..73be55f0 100644
--- a/test/cases/rlhc.d/case/element2.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/element2.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/element2.c-C-G0--goto-backend.exp b/test/rlhc.d/case/element2.c-C-G0--goto-backend.exp
index ab1d1417..ab1d1417 100644
--- a/test/cases/rlhc.d/case/element2.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/element2.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/element2.c-C-G0--goto-backend.in b/test/rlhc.d/case/element2.c-C-G0--goto-backend.in
index 7ea3fc0d..7ea3fc0d 100644
--- a/test/cases/rlhc.d/case/element2.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/element2.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/element2.c-C-G1--goto-backend.exp b/test/rlhc.d/case/element2.c-C-G1--goto-backend.exp
index fea03521..fea03521 100644
--- a/test/cases/rlhc.d/case/element2.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/element2.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/element2.c-C-G1--goto-backend.in b/test/rlhc.d/case/element2.c-C-G1--goto-backend.in
index f9f3c662..f9f3c662 100644
--- a/test/cases/rlhc.d/case/element2.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/element2.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/element2.c-C-G2--goto-backend.exp b/test/rlhc.d/case/element2.c-C-G2--goto-backend.exp
index aa9c8a00..aa9c8a00 100644
--- a/test/cases/rlhc.d/case/element2.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/element2.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/element2.c-C-G2--goto-backend.in b/test/rlhc.d/case/element2.c-C-G2--goto-backend.in
index ad14bca2..ad14bca2 100644
--- a/test/cases/rlhc.d/case/element2.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/element2.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/element2.c-C-T0--goto-backend.exp b/test/rlhc.d/case/element2.c-C-T0--goto-backend.exp
index 9d2cf069..9d2cf069 100644
--- a/test/cases/rlhc.d/case/element2.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/element2.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/element2.c-C-T0--goto-backend.in b/test/rlhc.d/case/element2.c-C-T0--goto-backend.in
index a15992ca..a15992ca 100644
--- a/test/cases/rlhc.d/case/element2.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/element2.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/element2.c-C-T0--var-backend.exp b/test/rlhc.d/case/element2.c-C-T0--var-backend.exp
index ef7f75dd..ef7f75dd 100644
--- a/test/cases/rlhc.d/case/element2.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/element2.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/element2.c-C-T0--var-backend.in b/test/rlhc.d/case/element2.c-C-T0--var-backend.in
index 748e9c3a..748e9c3a 100644
--- a/test/cases/rlhc.d/case/element2.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/element2.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/element2.c-C-T1--goto-backend.exp b/test/rlhc.d/case/element2.c-C-T1--goto-backend.exp
index 089d11c1..089d11c1 100644
--- a/test/cases/rlhc.d/case/element2.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/element2.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/element2.c-C-T1--goto-backend.in b/test/rlhc.d/case/element2.c-C-T1--goto-backend.in
index c9f75b30..c9f75b30 100644
--- a/test/cases/rlhc.d/case/element2.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/element2.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/element2.c-C-T1--var-backend.exp b/test/rlhc.d/case/element2.c-C-T1--var-backend.exp
index 64831bdf..64831bdf 100644
--- a/test/cases/rlhc.d/case/element2.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/element2.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/element2.c-C-T1--var-backend.in b/test/rlhc.d/case/element2.c-C-T1--var-backend.in
index 058b1b34..058b1b34 100644
--- a/test/cases/rlhc.d/case/element2.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/element2.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/element3.m-C-F0--goto-backend.exp b/test/rlhc.d/case/element3.m-C-F0--goto-backend.exp
index 7597a81d..7597a81d 100644
--- a/test/cases/rlhc.d/case/element3.m-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/element3.m-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/element3.m-C-F0--goto-backend.in b/test/rlhc.d/case/element3.m-C-F0--goto-backend.in
index 0825180f..0825180f 100644
--- a/test/cases/rlhc.d/case/element3.m-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/element3.m-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/element3.m-C-F0--var-backend.exp b/test/rlhc.d/case/element3.m-C-F0--var-backend.exp
index 3a2e49e4..3a2e49e4 100644
--- a/test/cases/rlhc.d/case/element3.m-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/element3.m-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/element3.m-C-F0--var-backend.in b/test/rlhc.d/case/element3.m-C-F0--var-backend.in
index 3b4ce252..3b4ce252 100644
--- a/test/cases/rlhc.d/case/element3.m-C-F0--var-backend.in
+++ b/test/rlhc.d/case/element3.m-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/element3.m-C-F1--goto-backend.exp b/test/rlhc.d/case/element3.m-C-F1--goto-backend.exp
index e0bc5e5f..e0bc5e5f 100644
--- a/test/cases/rlhc.d/case/element3.m-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/element3.m-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/element3.m-C-F1--goto-backend.in b/test/rlhc.d/case/element3.m-C-F1--goto-backend.in
index c71b1e00..c71b1e00 100644
--- a/test/cases/rlhc.d/case/element3.m-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/element3.m-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/element3.m-C-F1--var-backend.exp b/test/rlhc.d/case/element3.m-C-F1--var-backend.exp
index 39cc33a4..39cc33a4 100644
--- a/test/cases/rlhc.d/case/element3.m-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/element3.m-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/element3.m-C-F1--var-backend.in b/test/rlhc.d/case/element3.m-C-F1--var-backend.in
index 625413e4..625413e4 100644
--- a/test/cases/rlhc.d/case/element3.m-C-F1--var-backend.in
+++ b/test/rlhc.d/case/element3.m-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/element3.m-C-G0--goto-backend.exp b/test/rlhc.d/case/element3.m-C-G0--goto-backend.exp
index 647e302e..647e302e 100644
--- a/test/cases/rlhc.d/case/element3.m-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/element3.m-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/element3.m-C-G0--goto-backend.in b/test/rlhc.d/case/element3.m-C-G0--goto-backend.in
index 23511676..23511676 100644
--- a/test/cases/rlhc.d/case/element3.m-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/element3.m-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/element3.m-C-G1--goto-backend.exp b/test/rlhc.d/case/element3.m-C-G1--goto-backend.exp
index 978d76fc..978d76fc 100644
--- a/test/cases/rlhc.d/case/element3.m-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/element3.m-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/element3.m-C-G1--goto-backend.in b/test/rlhc.d/case/element3.m-C-G1--goto-backend.in
index 408efb1f..408efb1f 100644
--- a/test/cases/rlhc.d/case/element3.m-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/element3.m-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/element3.m-C-G2--goto-backend.exp b/test/rlhc.d/case/element3.m-C-G2--goto-backend.exp
index 5e29b612..5e29b612 100644
--- a/test/cases/rlhc.d/case/element3.m-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/element3.m-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/element3.m-C-G2--goto-backend.in b/test/rlhc.d/case/element3.m-C-G2--goto-backend.in
index 2c0250b2..2c0250b2 100644
--- a/test/cases/rlhc.d/case/element3.m-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/element3.m-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/element3.m-C-T0--goto-backend.exp b/test/rlhc.d/case/element3.m-C-T0--goto-backend.exp
index 2cd72070..2cd72070 100644
--- a/test/cases/rlhc.d/case/element3.m-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/element3.m-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/element3.m-C-T0--goto-backend.in b/test/rlhc.d/case/element3.m-C-T0--goto-backend.in
index 2341312b..2341312b 100644
--- a/test/cases/rlhc.d/case/element3.m-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/element3.m-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/element3.m-C-T0--var-backend.exp b/test/rlhc.d/case/element3.m-C-T0--var-backend.exp
index 5dc8e5eb..5dc8e5eb 100644
--- a/test/cases/rlhc.d/case/element3.m-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/element3.m-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/element3.m-C-T0--var-backend.in b/test/rlhc.d/case/element3.m-C-T0--var-backend.in
index fc71190d..fc71190d 100644
--- a/test/cases/rlhc.d/case/element3.m-C-T0--var-backend.in
+++ b/test/rlhc.d/case/element3.m-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/element3.m-C-T1--goto-backend.exp b/test/rlhc.d/case/element3.m-C-T1--goto-backend.exp
index 51f04335..51f04335 100644
--- a/test/cases/rlhc.d/case/element3.m-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/element3.m-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/element3.m-C-T1--goto-backend.in b/test/rlhc.d/case/element3.m-C-T1--goto-backend.in
index 45b39964..45b39964 100644
--- a/test/cases/rlhc.d/case/element3.m-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/element3.m-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/element3.m-C-T1--var-backend.exp b/test/rlhc.d/case/element3.m-C-T1--var-backend.exp
index 3f681f8b..3f681f8b 100644
--- a/test/cases/rlhc.d/case/element3.m-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/element3.m-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/element3.m-C-T1--var-backend.in b/test/rlhc.d/case/element3.m-C-T1--var-backend.in
index 59c2ac0b..59c2ac0b 100644
--- a/test/cases/rlhc.d/case/element3.m-C-T1--var-backend.in
+++ b/test/rlhc.d/case/element3.m-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_c.c-C-F0--goto-backend.exp b/test/rlhc.d/case/empty1_c.c-C-F0--goto-backend.exp
index d173ac83..d173ac83 100644
--- a/test/cases/rlhc.d/case/empty1_c.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/empty1_c.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_c.c-C-F0--goto-backend.in b/test/rlhc.d/case/empty1_c.c-C-F0--goto-backend.in
index a21d443f..a21d443f 100644
--- a/test/cases/rlhc.d/case/empty1_c.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/empty1_c.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_c.c-C-F0--var-backend.exp b/test/rlhc.d/case/empty1_c.c-C-F0--var-backend.exp
index 6bcfa6cf..6bcfa6cf 100644
--- a/test/cases/rlhc.d/case/empty1_c.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/empty1_c.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_c.c-C-F0--var-backend.in b/test/rlhc.d/case/empty1_c.c-C-F0--var-backend.in
index 1c2c5dfb..1c2c5dfb 100644
--- a/test/cases/rlhc.d/case/empty1_c.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/empty1_c.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_c.c-C-F1--goto-backend.exp b/test/rlhc.d/case/empty1_c.c-C-F1--goto-backend.exp
index 3c8b38ef..3c8b38ef 100644
--- a/test/cases/rlhc.d/case/empty1_c.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/empty1_c.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_c.c-C-F1--goto-backend.in b/test/rlhc.d/case/empty1_c.c-C-F1--goto-backend.in
index ac99871a..ac99871a 100644
--- a/test/cases/rlhc.d/case/empty1_c.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/empty1_c.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_c.c-C-F1--var-backend.exp b/test/rlhc.d/case/empty1_c.c-C-F1--var-backend.exp
index 6bcfa6cf..6bcfa6cf 100644
--- a/test/cases/rlhc.d/case/empty1_c.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/empty1_c.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_c.c-C-F1--var-backend.in b/test/rlhc.d/case/empty1_c.c-C-F1--var-backend.in
index 1c2c5dfb..1c2c5dfb 100644
--- a/test/cases/rlhc.d/case/empty1_c.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/empty1_c.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_c.c-C-G0--goto-backend.exp b/test/rlhc.d/case/empty1_c.c-C-G0--goto-backend.exp
index 2af67079..2af67079 100644
--- a/test/cases/rlhc.d/case/empty1_c.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/empty1_c.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_c.c-C-G0--goto-backend.in b/test/rlhc.d/case/empty1_c.c-C-G0--goto-backend.in
index c82298a6..c82298a6 100644
--- a/test/cases/rlhc.d/case/empty1_c.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/empty1_c.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_c.c-C-G1--goto-backend.exp b/test/rlhc.d/case/empty1_c.c-C-G1--goto-backend.exp
index 8a34b70d..8a34b70d 100644
--- a/test/cases/rlhc.d/case/empty1_c.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/empty1_c.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_c.c-C-G1--goto-backend.in b/test/rlhc.d/case/empty1_c.c-C-G1--goto-backend.in
index 344a00d6..344a00d6 100644
--- a/test/cases/rlhc.d/case/empty1_c.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/empty1_c.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_c.c-C-G2--goto-backend.exp b/test/rlhc.d/case/empty1_c.c-C-G2--goto-backend.exp
index 93c68931..93c68931 100644
--- a/test/cases/rlhc.d/case/empty1_c.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/empty1_c.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_c.c-C-G2--goto-backend.in b/test/rlhc.d/case/empty1_c.c-C-G2--goto-backend.in
index a1cb4cbb..a1cb4cbb 100644
--- a/test/cases/rlhc.d/case/empty1_c.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/empty1_c.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_c.c-C-T0--goto-backend.exp b/test/rlhc.d/case/empty1_c.c-C-T0--goto-backend.exp
index b72982b1..b72982b1 100644
--- a/test/cases/rlhc.d/case/empty1_c.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/empty1_c.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_c.c-C-T0--goto-backend.in b/test/rlhc.d/case/empty1_c.c-C-T0--goto-backend.in
index 5c6afbe7..5c6afbe7 100644
--- a/test/cases/rlhc.d/case/empty1_c.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/empty1_c.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_c.c-C-T0--var-backend.exp b/test/rlhc.d/case/empty1_c.c-C-T0--var-backend.exp
index 203adab1..203adab1 100644
--- a/test/cases/rlhc.d/case/empty1_c.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/empty1_c.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_c.c-C-T0--var-backend.in b/test/rlhc.d/case/empty1_c.c-C-T0--var-backend.in
index eacbecc6..eacbecc6 100644
--- a/test/cases/rlhc.d/case/empty1_c.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/empty1_c.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_c.c-C-T1--goto-backend.exp b/test/rlhc.d/case/empty1_c.c-C-T1--goto-backend.exp
index 130d0316..130d0316 100644
--- a/test/cases/rlhc.d/case/empty1_c.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/empty1_c.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_c.c-C-T1--goto-backend.in b/test/rlhc.d/case/empty1_c.c-C-T1--goto-backend.in
index 0cc1ffc0..0cc1ffc0 100644
--- a/test/cases/rlhc.d/case/empty1_c.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/empty1_c.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_c.c-C-T1--var-backend.exp b/test/rlhc.d/case/empty1_c.c-C-T1--var-backend.exp
index fe3a7578..fe3a7578 100644
--- a/test/cases/rlhc.d/case/empty1_c.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/empty1_c.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_c.c-C-T1--var-backend.in b/test/rlhc.d/case/empty1_c.c-C-T1--var-backend.in
index 5a22e163..5a22e163 100644
--- a/test/cases/rlhc.d/case/empty1_c.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/empty1_c.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_crack.crk-K-F0--var-backend.exp b/test/rlhc.d/case/empty1_crack.crk-K-F0--var-backend.exp
index 13b0d019..13b0d019 100644
--- a/test/cases/rlhc.d/case/empty1_crack.crk-K-F0--var-backend.exp
+++ b/test/rlhc.d/case/empty1_crack.crk-K-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_crack.crk-K-F0--var-backend.in b/test/rlhc.d/case/empty1_crack.crk-K-F0--var-backend.in
index b855cda5..b855cda5 100644
--- a/test/cases/rlhc.d/case/empty1_crack.crk-K-F0--var-backend.in
+++ b/test/rlhc.d/case/empty1_crack.crk-K-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_crack.crk-K-F1--var-backend.exp b/test/rlhc.d/case/empty1_crack.crk-K-F1--var-backend.exp
index 13b0d019..13b0d019 100644
--- a/test/cases/rlhc.d/case/empty1_crack.crk-K-F1--var-backend.exp
+++ b/test/rlhc.d/case/empty1_crack.crk-K-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_crack.crk-K-F1--var-backend.in b/test/rlhc.d/case/empty1_crack.crk-K-F1--var-backend.in
index b855cda5..b855cda5 100644
--- a/test/cases/rlhc.d/case/empty1_crack.crk-K-F1--var-backend.in
+++ b/test/rlhc.d/case/empty1_crack.crk-K-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_crack.crk-K-T0--var-backend.exp b/test/rlhc.d/case/empty1_crack.crk-K-T0--var-backend.exp
index 746f1313..746f1313 100644
--- a/test/cases/rlhc.d/case/empty1_crack.crk-K-T0--var-backend.exp
+++ b/test/rlhc.d/case/empty1_crack.crk-K-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_crack.crk-K-T0--var-backend.in b/test/rlhc.d/case/empty1_crack.crk-K-T0--var-backend.in
index dda6c093..dda6c093 100644
--- a/test/cases/rlhc.d/case/empty1_crack.crk-K-T0--var-backend.in
+++ b/test/rlhc.d/case/empty1_crack.crk-K-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_crack.crk-K-T1--var-backend.exp b/test/rlhc.d/case/empty1_crack.crk-K-T1--var-backend.exp
index 0e2de315..0e2de315 100644
--- a/test/cases/rlhc.d/case/empty1_crack.crk-K-T1--var-backend.exp
+++ b/test/rlhc.d/case/empty1_crack.crk-K-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_crack.crk-K-T1--var-backend.in b/test/rlhc.d/case/empty1_crack.crk-K-T1--var-backend.in
index 99336f38..99336f38 100644
--- a/test/cases/rlhc.d/case/empty1_crack.crk-K-T1--var-backend.in
+++ b/test/rlhc.d/case/empty1_crack.crk-K-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_cs.cs-A-F0--goto-backend.exp b/test/rlhc.d/case/empty1_cs.cs-A-F0--goto-backend.exp
index 1f03995e..1f03995e 100644
--- a/test/cases/rlhc.d/case/empty1_cs.cs-A-F0--goto-backend.exp
+++ b/test/rlhc.d/case/empty1_cs.cs-A-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_cs.cs-A-F0--goto-backend.in b/test/rlhc.d/case/empty1_cs.cs-A-F0--goto-backend.in
index 176c9eb7..176c9eb7 100644
--- a/test/cases/rlhc.d/case/empty1_cs.cs-A-F0--goto-backend.in
+++ b/test/rlhc.d/case/empty1_cs.cs-A-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_cs.cs-A-F0--var-backend.exp b/test/rlhc.d/case/empty1_cs.cs-A-F0--var-backend.exp
index 3e93a7e8..3e93a7e8 100644
--- a/test/cases/rlhc.d/case/empty1_cs.cs-A-F0--var-backend.exp
+++ b/test/rlhc.d/case/empty1_cs.cs-A-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_cs.cs-A-F0--var-backend.in b/test/rlhc.d/case/empty1_cs.cs-A-F0--var-backend.in
index 51c6bdea..51c6bdea 100644
--- a/test/cases/rlhc.d/case/empty1_cs.cs-A-F0--var-backend.in
+++ b/test/rlhc.d/case/empty1_cs.cs-A-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_cs.cs-A-F1--goto-backend.exp b/test/rlhc.d/case/empty1_cs.cs-A-F1--goto-backend.exp
index a095f885..a095f885 100644
--- a/test/cases/rlhc.d/case/empty1_cs.cs-A-F1--goto-backend.exp
+++ b/test/rlhc.d/case/empty1_cs.cs-A-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_cs.cs-A-F1--goto-backend.in b/test/rlhc.d/case/empty1_cs.cs-A-F1--goto-backend.in
index 2ebb9320..2ebb9320 100644
--- a/test/cases/rlhc.d/case/empty1_cs.cs-A-F1--goto-backend.in
+++ b/test/rlhc.d/case/empty1_cs.cs-A-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_cs.cs-A-F1--var-backend.exp b/test/rlhc.d/case/empty1_cs.cs-A-F1--var-backend.exp
index 3e93a7e8..3e93a7e8 100644
--- a/test/cases/rlhc.d/case/empty1_cs.cs-A-F1--var-backend.exp
+++ b/test/rlhc.d/case/empty1_cs.cs-A-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_cs.cs-A-F1--var-backend.in b/test/rlhc.d/case/empty1_cs.cs-A-F1--var-backend.in
index 51c6bdea..51c6bdea 100644
--- a/test/cases/rlhc.d/case/empty1_cs.cs-A-F1--var-backend.in
+++ b/test/rlhc.d/case/empty1_cs.cs-A-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_cs.cs-A-G0--goto-backend.exp b/test/rlhc.d/case/empty1_cs.cs-A-G0--goto-backend.exp
index b7229a33..b7229a33 100644
--- a/test/cases/rlhc.d/case/empty1_cs.cs-A-G0--goto-backend.exp
+++ b/test/rlhc.d/case/empty1_cs.cs-A-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_cs.cs-A-G0--goto-backend.in b/test/rlhc.d/case/empty1_cs.cs-A-G0--goto-backend.in
index b7eb57db..b7eb57db 100644
--- a/test/cases/rlhc.d/case/empty1_cs.cs-A-G0--goto-backend.in
+++ b/test/rlhc.d/case/empty1_cs.cs-A-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_cs.cs-A-G1--goto-backend.exp b/test/rlhc.d/case/empty1_cs.cs-A-G1--goto-backend.exp
index 56ca3dbd..56ca3dbd 100644
--- a/test/cases/rlhc.d/case/empty1_cs.cs-A-G1--goto-backend.exp
+++ b/test/rlhc.d/case/empty1_cs.cs-A-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_cs.cs-A-G1--goto-backend.in b/test/rlhc.d/case/empty1_cs.cs-A-G1--goto-backend.in
index 22c8745d..22c8745d 100644
--- a/test/cases/rlhc.d/case/empty1_cs.cs-A-G1--goto-backend.in
+++ b/test/rlhc.d/case/empty1_cs.cs-A-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_cs.cs-A-T0--goto-backend.exp b/test/rlhc.d/case/empty1_cs.cs-A-T0--goto-backend.exp
index cbc6d874..cbc6d874 100644
--- a/test/cases/rlhc.d/case/empty1_cs.cs-A-T0--goto-backend.exp
+++ b/test/rlhc.d/case/empty1_cs.cs-A-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_cs.cs-A-T0--goto-backend.in b/test/rlhc.d/case/empty1_cs.cs-A-T0--goto-backend.in
index c34344ec..c34344ec 100644
--- a/test/cases/rlhc.d/case/empty1_cs.cs-A-T0--goto-backend.in
+++ b/test/rlhc.d/case/empty1_cs.cs-A-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_cs.cs-A-T0--var-backend.exp b/test/rlhc.d/case/empty1_cs.cs-A-T0--var-backend.exp
index a8f4cf05..a8f4cf05 100644
--- a/test/cases/rlhc.d/case/empty1_cs.cs-A-T0--var-backend.exp
+++ b/test/rlhc.d/case/empty1_cs.cs-A-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_cs.cs-A-T0--var-backend.in b/test/rlhc.d/case/empty1_cs.cs-A-T0--var-backend.in
index 059da46d..059da46d 100644
--- a/test/cases/rlhc.d/case/empty1_cs.cs-A-T0--var-backend.in
+++ b/test/rlhc.d/case/empty1_cs.cs-A-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_cs.cs-A-T1--goto-backend.exp b/test/rlhc.d/case/empty1_cs.cs-A-T1--goto-backend.exp
index b05ac413..b05ac413 100644
--- a/test/cases/rlhc.d/case/empty1_cs.cs-A-T1--goto-backend.exp
+++ b/test/rlhc.d/case/empty1_cs.cs-A-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_cs.cs-A-T1--goto-backend.in b/test/rlhc.d/case/empty1_cs.cs-A-T1--goto-backend.in
index c232ee6d..c232ee6d 100644
--- a/test/cases/rlhc.d/case/empty1_cs.cs-A-T1--goto-backend.in
+++ b/test/rlhc.d/case/empty1_cs.cs-A-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_cs.cs-A-T1--var-backend.exp b/test/rlhc.d/case/empty1_cs.cs-A-T1--var-backend.exp
index 0573ff90..0573ff90 100644
--- a/test/cases/rlhc.d/case/empty1_cs.cs-A-T1--var-backend.exp
+++ b/test/rlhc.d/case/empty1_cs.cs-A-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_cs.cs-A-T1--var-backend.in b/test/rlhc.d/case/empty1_cs.cs-A-T1--var-backend.in
index 248c34ec..248c34ec 100644
--- a/test/cases/rlhc.d/case/empty1_cs.cs-A-T1--var-backend.in
+++ b/test/rlhc.d/case/empty1_cs.cs-A-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_go.go-Z-F0--goto-backend.exp b/test/rlhc.d/case/empty1_go.go-Z-F0--goto-backend.exp
index b2806de6..b2806de6 100644
--- a/test/cases/rlhc.d/case/empty1_go.go-Z-F0--goto-backend.exp
+++ b/test/rlhc.d/case/empty1_go.go-Z-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_go.go-Z-F0--goto-backend.in b/test/rlhc.d/case/empty1_go.go-Z-F0--goto-backend.in
index 20994fd8..20994fd8 100644
--- a/test/cases/rlhc.d/case/empty1_go.go-Z-F0--goto-backend.in
+++ b/test/rlhc.d/case/empty1_go.go-Z-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_go.go-Z-F0--var-backend.exp b/test/rlhc.d/case/empty1_go.go-Z-F0--var-backend.exp
index d91b399c..d91b399c 100644
--- a/test/cases/rlhc.d/case/empty1_go.go-Z-F0--var-backend.exp
+++ b/test/rlhc.d/case/empty1_go.go-Z-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_go.go-Z-F0--var-backend.in b/test/rlhc.d/case/empty1_go.go-Z-F0--var-backend.in
index 02aba86e..02aba86e 100644
--- a/test/cases/rlhc.d/case/empty1_go.go-Z-F0--var-backend.in
+++ b/test/rlhc.d/case/empty1_go.go-Z-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_go.go-Z-F1--goto-backend.exp b/test/rlhc.d/case/empty1_go.go-Z-F1--goto-backend.exp
index 5b00bbf0..5b00bbf0 100644
--- a/test/cases/rlhc.d/case/empty1_go.go-Z-F1--goto-backend.exp
+++ b/test/rlhc.d/case/empty1_go.go-Z-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_go.go-Z-F1--goto-backend.in b/test/rlhc.d/case/empty1_go.go-Z-F1--goto-backend.in
index bb241d2f..bb241d2f 100644
--- a/test/cases/rlhc.d/case/empty1_go.go-Z-F1--goto-backend.in
+++ b/test/rlhc.d/case/empty1_go.go-Z-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_go.go-Z-F1--var-backend.exp b/test/rlhc.d/case/empty1_go.go-Z-F1--var-backend.exp
index d91b399c..d91b399c 100644
--- a/test/cases/rlhc.d/case/empty1_go.go-Z-F1--var-backend.exp
+++ b/test/rlhc.d/case/empty1_go.go-Z-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_go.go-Z-F1--var-backend.in b/test/rlhc.d/case/empty1_go.go-Z-F1--var-backend.in
index 02aba86e..02aba86e 100644
--- a/test/cases/rlhc.d/case/empty1_go.go-Z-F1--var-backend.in
+++ b/test/rlhc.d/case/empty1_go.go-Z-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_go.go-Z-G0--goto-backend.exp b/test/rlhc.d/case/empty1_go.go-Z-G0--goto-backend.exp
index 6e06d3db..6e06d3db 100644
--- a/test/cases/rlhc.d/case/empty1_go.go-Z-G0--goto-backend.exp
+++ b/test/rlhc.d/case/empty1_go.go-Z-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_go.go-Z-G0--goto-backend.in b/test/rlhc.d/case/empty1_go.go-Z-G0--goto-backend.in
index 2a2593d4..2a2593d4 100644
--- a/test/cases/rlhc.d/case/empty1_go.go-Z-G0--goto-backend.in
+++ b/test/rlhc.d/case/empty1_go.go-Z-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_go.go-Z-G1--goto-backend.exp b/test/rlhc.d/case/empty1_go.go-Z-G1--goto-backend.exp
index 576124ae..576124ae 100644
--- a/test/cases/rlhc.d/case/empty1_go.go-Z-G1--goto-backend.exp
+++ b/test/rlhc.d/case/empty1_go.go-Z-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_go.go-Z-G1--goto-backend.in b/test/rlhc.d/case/empty1_go.go-Z-G1--goto-backend.in
index cd966865..cd966865 100644
--- a/test/cases/rlhc.d/case/empty1_go.go-Z-G1--goto-backend.in
+++ b/test/rlhc.d/case/empty1_go.go-Z-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_go.go-Z-G2--goto-backend.exp b/test/rlhc.d/case/empty1_go.go-Z-G2--goto-backend.exp
index ae93529e..ae93529e 100644
--- a/test/cases/rlhc.d/case/empty1_go.go-Z-G2--goto-backend.exp
+++ b/test/rlhc.d/case/empty1_go.go-Z-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_go.go-Z-G2--goto-backend.in b/test/rlhc.d/case/empty1_go.go-Z-G2--goto-backend.in
index aad5a734..aad5a734 100644
--- a/test/cases/rlhc.d/case/empty1_go.go-Z-G2--goto-backend.in
+++ b/test/rlhc.d/case/empty1_go.go-Z-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_go.go-Z-T0--goto-backend.exp b/test/rlhc.d/case/empty1_go.go-Z-T0--goto-backend.exp
index 14824ef6..14824ef6 100644
--- a/test/cases/rlhc.d/case/empty1_go.go-Z-T0--goto-backend.exp
+++ b/test/rlhc.d/case/empty1_go.go-Z-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_go.go-Z-T0--goto-backend.in b/test/rlhc.d/case/empty1_go.go-Z-T0--goto-backend.in
index 8ad09476..8ad09476 100644
--- a/test/cases/rlhc.d/case/empty1_go.go-Z-T0--goto-backend.in
+++ b/test/rlhc.d/case/empty1_go.go-Z-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_go.go-Z-T0--var-backend.exp b/test/rlhc.d/case/empty1_go.go-Z-T0--var-backend.exp
index 52c418ff..52c418ff 100644
--- a/test/cases/rlhc.d/case/empty1_go.go-Z-T0--var-backend.exp
+++ b/test/rlhc.d/case/empty1_go.go-Z-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_go.go-Z-T0--var-backend.in b/test/rlhc.d/case/empty1_go.go-Z-T0--var-backend.in
index 552ba9f7..552ba9f7 100644
--- a/test/cases/rlhc.d/case/empty1_go.go-Z-T0--var-backend.in
+++ b/test/rlhc.d/case/empty1_go.go-Z-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_go.go-Z-T1--goto-backend.exp b/test/rlhc.d/case/empty1_go.go-Z-T1--goto-backend.exp
index 987eeff1..987eeff1 100644
--- a/test/cases/rlhc.d/case/empty1_go.go-Z-T1--goto-backend.exp
+++ b/test/rlhc.d/case/empty1_go.go-Z-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_go.go-Z-T1--goto-backend.in b/test/rlhc.d/case/empty1_go.go-Z-T1--goto-backend.in
index 6c693546..6c693546 100644
--- a/test/cases/rlhc.d/case/empty1_go.go-Z-T1--goto-backend.in
+++ b/test/rlhc.d/case/empty1_go.go-Z-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_go.go-Z-T1--var-backend.exp b/test/rlhc.d/case/empty1_go.go-Z-T1--var-backend.exp
index 48951e14..48951e14 100644
--- a/test/cases/rlhc.d/case/empty1_go.go-Z-T1--var-backend.exp
+++ b/test/rlhc.d/case/empty1_go.go-Z-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_go.go-Z-T1--var-backend.in b/test/rlhc.d/case/empty1_go.go-Z-T1--var-backend.in
index 87a14b6c..87a14b6c 100644
--- a/test/cases/rlhc.d/case/empty1_go.go-Z-T1--var-backend.in
+++ b/test/rlhc.d/case/empty1_go.go-Z-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_java.java-J-F0--goto-backend.exp b/test/rlhc.d/case/empty1_java.java-J-F0--goto-backend.exp
index 06e53b36..06e53b36 100644
--- a/test/cases/rlhc.d/case/empty1_java.java-J-F0--goto-backend.exp
+++ b/test/rlhc.d/case/empty1_java.java-J-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_java.java-J-F0--goto-backend.in b/test/rlhc.d/case/empty1_java.java-J-F0--goto-backend.in
index 593fc496..593fc496 100644
--- a/test/cases/rlhc.d/case/empty1_java.java-J-F0--goto-backend.in
+++ b/test/rlhc.d/case/empty1_java.java-J-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_java.java-J-F0--var-backend.exp b/test/rlhc.d/case/empty1_java.java-J-F0--var-backend.exp
index 73fe9ab3..73fe9ab3 100644
--- a/test/cases/rlhc.d/case/empty1_java.java-J-F0--var-backend.exp
+++ b/test/rlhc.d/case/empty1_java.java-J-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_java.java-J-F0--var-backend.in b/test/rlhc.d/case/empty1_java.java-J-F0--var-backend.in
index 9c8b984c..9c8b984c 100644
--- a/test/cases/rlhc.d/case/empty1_java.java-J-F0--var-backend.in
+++ b/test/rlhc.d/case/empty1_java.java-J-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_java.java-J-F1--goto-backend.exp b/test/rlhc.d/case/empty1_java.java-J-F1--goto-backend.exp
index 9c8a87ef..9c8a87ef 100644
--- a/test/cases/rlhc.d/case/empty1_java.java-J-F1--goto-backend.exp
+++ b/test/rlhc.d/case/empty1_java.java-J-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_java.java-J-F1--goto-backend.in b/test/rlhc.d/case/empty1_java.java-J-F1--goto-backend.in
index 5bc13662..5bc13662 100644
--- a/test/cases/rlhc.d/case/empty1_java.java-J-F1--goto-backend.in
+++ b/test/rlhc.d/case/empty1_java.java-J-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_java.java-J-F1--var-backend.exp b/test/rlhc.d/case/empty1_java.java-J-F1--var-backend.exp
index 73fe9ab3..73fe9ab3 100644
--- a/test/cases/rlhc.d/case/empty1_java.java-J-F1--var-backend.exp
+++ b/test/rlhc.d/case/empty1_java.java-J-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_java.java-J-F1--var-backend.in b/test/rlhc.d/case/empty1_java.java-J-F1--var-backend.in
index 9c8b984c..9c8b984c 100644
--- a/test/cases/rlhc.d/case/empty1_java.java-J-F1--var-backend.in
+++ b/test/rlhc.d/case/empty1_java.java-J-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_java.java-J-T0--goto-backend.exp b/test/rlhc.d/case/empty1_java.java-J-T0--goto-backend.exp
index 50d37ef8..50d37ef8 100644
--- a/test/cases/rlhc.d/case/empty1_java.java-J-T0--goto-backend.exp
+++ b/test/rlhc.d/case/empty1_java.java-J-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_java.java-J-T0--goto-backend.in b/test/rlhc.d/case/empty1_java.java-J-T0--goto-backend.in
index 6b8ce3ca..6b8ce3ca 100644
--- a/test/cases/rlhc.d/case/empty1_java.java-J-T0--goto-backend.in
+++ b/test/rlhc.d/case/empty1_java.java-J-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_java.java-J-T0--var-backend.exp b/test/rlhc.d/case/empty1_java.java-J-T0--var-backend.exp
index a1942b0a..a1942b0a 100644
--- a/test/cases/rlhc.d/case/empty1_java.java-J-T0--var-backend.exp
+++ b/test/rlhc.d/case/empty1_java.java-J-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_java.java-J-T0--var-backend.in b/test/rlhc.d/case/empty1_java.java-J-T0--var-backend.in
index 490cf1f7..490cf1f7 100644
--- a/test/cases/rlhc.d/case/empty1_java.java-J-T0--var-backend.in
+++ b/test/rlhc.d/case/empty1_java.java-J-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_java.java-J-T1--goto-backend.exp b/test/rlhc.d/case/empty1_java.java-J-T1--goto-backend.exp
index 3bd56bac..3bd56bac 100644
--- a/test/cases/rlhc.d/case/empty1_java.java-J-T1--goto-backend.exp
+++ b/test/rlhc.d/case/empty1_java.java-J-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_java.java-J-T1--goto-backend.in b/test/rlhc.d/case/empty1_java.java-J-T1--goto-backend.in
index 51fd1d46..51fd1d46 100644
--- a/test/cases/rlhc.d/case/empty1_java.java-J-T1--goto-backend.in
+++ b/test/rlhc.d/case/empty1_java.java-J-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_java.java-J-T1--var-backend.exp b/test/rlhc.d/case/empty1_java.java-J-T1--var-backend.exp
index bb38d33e..bb38d33e 100644
--- a/test/cases/rlhc.d/case/empty1_java.java-J-T1--var-backend.exp
+++ b/test/rlhc.d/case/empty1_java.java-J-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_java.java-J-T1--var-backend.in b/test/rlhc.d/case/empty1_java.java-J-T1--var-backend.in
index a6d91042..a6d91042 100644
--- a/test/cases/rlhc.d/case/empty1_java.java-J-T1--var-backend.in
+++ b/test/rlhc.d/case/empty1_java.java-J-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_julia.jl-Y-F0--var-backend.exp b/test/rlhc.d/case/empty1_julia.jl-Y-F0--var-backend.exp
index 92ff4982..92ff4982 100644
--- a/test/cases/rlhc.d/case/empty1_julia.jl-Y-F0--var-backend.exp
+++ b/test/rlhc.d/case/empty1_julia.jl-Y-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_julia.jl-Y-F0--var-backend.in b/test/rlhc.d/case/empty1_julia.jl-Y-F0--var-backend.in
index 7e535dde..7e535dde 100644
--- a/test/cases/rlhc.d/case/empty1_julia.jl-Y-F0--var-backend.in
+++ b/test/rlhc.d/case/empty1_julia.jl-Y-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_julia.jl-Y-F1--var-backend.exp b/test/rlhc.d/case/empty1_julia.jl-Y-F1--var-backend.exp
index 92ff4982..92ff4982 100644
--- a/test/cases/rlhc.d/case/empty1_julia.jl-Y-F1--var-backend.exp
+++ b/test/rlhc.d/case/empty1_julia.jl-Y-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_julia.jl-Y-F1--var-backend.in b/test/rlhc.d/case/empty1_julia.jl-Y-F1--var-backend.in
index 7e535dde..7e535dde 100644
--- a/test/cases/rlhc.d/case/empty1_julia.jl-Y-F1--var-backend.in
+++ b/test/rlhc.d/case/empty1_julia.jl-Y-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_julia.jl-Y-T0--var-backend.exp b/test/rlhc.d/case/empty1_julia.jl-Y-T0--var-backend.exp
index 03c085cc..03c085cc 100644
--- a/test/cases/rlhc.d/case/empty1_julia.jl-Y-T0--var-backend.exp
+++ b/test/rlhc.d/case/empty1_julia.jl-Y-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_julia.jl-Y-T0--var-backend.in b/test/rlhc.d/case/empty1_julia.jl-Y-T0--var-backend.in
index 8ab5edea..8ab5edea 100644
--- a/test/cases/rlhc.d/case/empty1_julia.jl-Y-T0--var-backend.in
+++ b/test/rlhc.d/case/empty1_julia.jl-Y-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_julia.jl-Y-T1--var-backend.exp b/test/rlhc.d/case/empty1_julia.jl-Y-T1--var-backend.exp
index 6b691fc8..6b691fc8 100644
--- a/test/cases/rlhc.d/case/empty1_julia.jl-Y-T1--var-backend.exp
+++ b/test/rlhc.d/case/empty1_julia.jl-Y-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_julia.jl-Y-T1--var-backend.in b/test/rlhc.d/case/empty1_julia.jl-Y-T1--var-backend.in
index 62c56102..62c56102 100644
--- a/test/cases/rlhc.d/case/empty1_julia.jl-Y-T1--var-backend.in
+++ b/test/rlhc.d/case/empty1_julia.jl-Y-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_ocaml.ml-O-F0--var-backend.exp b/test/rlhc.d/case/empty1_ocaml.ml-O-F0--var-backend.exp
index 2a0b09dc..2a0b09dc 100644
--- a/test/cases/rlhc.d/case/empty1_ocaml.ml-O-F0--var-backend.exp
+++ b/test/rlhc.d/case/empty1_ocaml.ml-O-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_ocaml.ml-O-F0--var-backend.in b/test/rlhc.d/case/empty1_ocaml.ml-O-F0--var-backend.in
index 8ca7df32..8ca7df32 100644
--- a/test/cases/rlhc.d/case/empty1_ocaml.ml-O-F0--var-backend.in
+++ b/test/rlhc.d/case/empty1_ocaml.ml-O-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_ocaml.ml-O-F1--var-backend.exp b/test/rlhc.d/case/empty1_ocaml.ml-O-F1--var-backend.exp
index 2a0b09dc..2a0b09dc 100644
--- a/test/cases/rlhc.d/case/empty1_ocaml.ml-O-F1--var-backend.exp
+++ b/test/rlhc.d/case/empty1_ocaml.ml-O-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_ocaml.ml-O-F1--var-backend.in b/test/rlhc.d/case/empty1_ocaml.ml-O-F1--var-backend.in
index 8ca7df32..8ca7df32 100644
--- a/test/cases/rlhc.d/case/empty1_ocaml.ml-O-F1--var-backend.in
+++ b/test/rlhc.d/case/empty1_ocaml.ml-O-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_ocaml.ml-O-T0--var-backend.exp b/test/rlhc.d/case/empty1_ocaml.ml-O-T0--var-backend.exp
index fd339bd0..fd339bd0 100644
--- a/test/cases/rlhc.d/case/empty1_ocaml.ml-O-T0--var-backend.exp
+++ b/test/rlhc.d/case/empty1_ocaml.ml-O-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_ocaml.ml-O-T0--var-backend.in b/test/rlhc.d/case/empty1_ocaml.ml-O-T0--var-backend.in
index e08b1b7b..e08b1b7b 100644
--- a/test/cases/rlhc.d/case/empty1_ocaml.ml-O-T0--var-backend.in
+++ b/test/rlhc.d/case/empty1_ocaml.ml-O-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_ocaml.ml-O-T1--var-backend.exp b/test/rlhc.d/case/empty1_ocaml.ml-O-T1--var-backend.exp
index a3143feb..a3143feb 100644
--- a/test/cases/rlhc.d/case/empty1_ocaml.ml-O-T1--var-backend.exp
+++ b/test/rlhc.d/case/empty1_ocaml.ml-O-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_ocaml.ml-O-T1--var-backend.in b/test/rlhc.d/case/empty1_ocaml.ml-O-T1--var-backend.in
index f5d8b4c2..f5d8b4c2 100644
--- a/test/cases/rlhc.d/case/empty1_ocaml.ml-O-T1--var-backend.in
+++ b/test/rlhc.d/case/empty1_ocaml.ml-O-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_ruby.rb-R-F0--var-backend.exp b/test/rlhc.d/case/empty1_ruby.rb-R-F0--var-backend.exp
index b7205f2d..b7205f2d 100644
--- a/test/cases/rlhc.d/case/empty1_ruby.rb-R-F0--var-backend.exp
+++ b/test/rlhc.d/case/empty1_ruby.rb-R-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_ruby.rb-R-F0--var-backend.in b/test/rlhc.d/case/empty1_ruby.rb-R-F0--var-backend.in
index 5e424b61..5e424b61 100644
--- a/test/cases/rlhc.d/case/empty1_ruby.rb-R-F0--var-backend.in
+++ b/test/rlhc.d/case/empty1_ruby.rb-R-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_ruby.rb-R-F1--var-backend.exp b/test/rlhc.d/case/empty1_ruby.rb-R-F1--var-backend.exp
index b7205f2d..b7205f2d 100644
--- a/test/cases/rlhc.d/case/empty1_ruby.rb-R-F1--var-backend.exp
+++ b/test/rlhc.d/case/empty1_ruby.rb-R-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_ruby.rb-R-F1--var-backend.in b/test/rlhc.d/case/empty1_ruby.rb-R-F1--var-backend.in
index 5e424b61..5e424b61 100644
--- a/test/cases/rlhc.d/case/empty1_ruby.rb-R-F1--var-backend.in
+++ b/test/rlhc.d/case/empty1_ruby.rb-R-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_ruby.rb-R-T0--var-backend.exp b/test/rlhc.d/case/empty1_ruby.rb-R-T0--var-backend.exp
index e9c333dc..e9c333dc 100644
--- a/test/cases/rlhc.d/case/empty1_ruby.rb-R-T0--var-backend.exp
+++ b/test/rlhc.d/case/empty1_ruby.rb-R-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_ruby.rb-R-T0--var-backend.in b/test/rlhc.d/case/empty1_ruby.rb-R-T0--var-backend.in
index 7db1e617..7db1e617 100644
--- a/test/cases/rlhc.d/case/empty1_ruby.rb-R-T0--var-backend.in
+++ b/test/rlhc.d/case/empty1_ruby.rb-R-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_ruby.rb-R-T1--var-backend.exp b/test/rlhc.d/case/empty1_ruby.rb-R-T1--var-backend.exp
index 1193f483..1193f483 100644
--- a/test/cases/rlhc.d/case/empty1_ruby.rb-R-T1--var-backend.exp
+++ b/test/rlhc.d/case/empty1_ruby.rb-R-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_ruby.rb-R-T1--var-backend.in b/test/rlhc.d/case/empty1_ruby.rb-R-T1--var-backend.in
index 345de92c..345de92c 100644
--- a/test/cases/rlhc.d/case/empty1_ruby.rb-R-T1--var-backend.in
+++ b/test/rlhc.d/case/empty1_ruby.rb-R-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_rust.rs-U-F0--var-backend.exp b/test/rlhc.d/case/empty1_rust.rs-U-F0--var-backend.exp
index e81369fb..e81369fb 100644
--- a/test/cases/rlhc.d/case/empty1_rust.rs-U-F0--var-backend.exp
+++ b/test/rlhc.d/case/empty1_rust.rs-U-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_rust.rs-U-F0--var-backend.in b/test/rlhc.d/case/empty1_rust.rs-U-F0--var-backend.in
index 9946d075..9946d075 100644
--- a/test/cases/rlhc.d/case/empty1_rust.rs-U-F0--var-backend.in
+++ b/test/rlhc.d/case/empty1_rust.rs-U-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_rust.rs-U-F1--var-backend.exp b/test/rlhc.d/case/empty1_rust.rs-U-F1--var-backend.exp
index e81369fb..e81369fb 100644
--- a/test/cases/rlhc.d/case/empty1_rust.rs-U-F1--var-backend.exp
+++ b/test/rlhc.d/case/empty1_rust.rs-U-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_rust.rs-U-F1--var-backend.in b/test/rlhc.d/case/empty1_rust.rs-U-F1--var-backend.in
index 9946d075..9946d075 100644
--- a/test/cases/rlhc.d/case/empty1_rust.rs-U-F1--var-backend.in
+++ b/test/rlhc.d/case/empty1_rust.rs-U-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_rust.rs-U-T0--var-backend.exp b/test/rlhc.d/case/empty1_rust.rs-U-T0--var-backend.exp
index 9263501a..9263501a 100644
--- a/test/cases/rlhc.d/case/empty1_rust.rs-U-T0--var-backend.exp
+++ b/test/rlhc.d/case/empty1_rust.rs-U-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_rust.rs-U-T0--var-backend.in b/test/rlhc.d/case/empty1_rust.rs-U-T0--var-backend.in
index 119a1466..119a1466 100644
--- a/test/cases/rlhc.d/case/empty1_rust.rs-U-T0--var-backend.in
+++ b/test/rlhc.d/case/empty1_rust.rs-U-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/empty1_rust.rs-U-T1--var-backend.exp b/test/rlhc.d/case/empty1_rust.rs-U-T1--var-backend.exp
index 03e247f5..03e247f5 100644
--- a/test/cases/rlhc.d/case/empty1_rust.rs-U-T1--var-backend.exp
+++ b/test/rlhc.d/case/empty1_rust.rs-U-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/empty1_rust.rs-U-T1--var-backend.in b/test/rlhc.d/case/empty1_rust.rs-U-T1--var-backend.in
index b5e98eda..b5e98eda 100644
--- a/test/cases/rlhc.d/case/empty1_rust.rs-U-T1--var-backend.in
+++ b/test/rlhc.d/case/empty1_rust.rs-U-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_c.c-C-F0--goto-backend.exp b/test/rlhc.d/case/eofact_c.c-C-F0--goto-backend.exp
index b35a8a16..b35a8a16 100644
--- a/test/cases/rlhc.d/case/eofact_c.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/eofact_c.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_c.c-C-F0--goto-backend.in b/test/rlhc.d/case/eofact_c.c-C-F0--goto-backend.in
index 3c86050d..3c86050d 100644
--- a/test/cases/rlhc.d/case/eofact_c.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/eofact_c.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_c.c-C-F0--var-backend.exp b/test/rlhc.d/case/eofact_c.c-C-F0--var-backend.exp
index 50d17eaf..50d17eaf 100644
--- a/test/cases/rlhc.d/case/eofact_c.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/eofact_c.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_c.c-C-F0--var-backend.in b/test/rlhc.d/case/eofact_c.c-C-F0--var-backend.in
index aca50fc3..aca50fc3 100644
--- a/test/cases/rlhc.d/case/eofact_c.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/eofact_c.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_c.c-C-F1--goto-backend.exp b/test/rlhc.d/case/eofact_c.c-C-F1--goto-backend.exp
index ad7541d8..ad7541d8 100644
--- a/test/cases/rlhc.d/case/eofact_c.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/eofact_c.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_c.c-C-F1--goto-backend.in b/test/rlhc.d/case/eofact_c.c-C-F1--goto-backend.in
index 761d4414..761d4414 100644
--- a/test/cases/rlhc.d/case/eofact_c.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/eofact_c.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_c.c-C-F1--var-backend.exp b/test/rlhc.d/case/eofact_c.c-C-F1--var-backend.exp
index 134bb8f3..134bb8f3 100644
--- a/test/cases/rlhc.d/case/eofact_c.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/eofact_c.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_c.c-C-F1--var-backend.in b/test/rlhc.d/case/eofact_c.c-C-F1--var-backend.in
index 4210870d..4210870d 100644
--- a/test/cases/rlhc.d/case/eofact_c.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/eofact_c.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_c.c-C-G0--goto-backend.exp b/test/rlhc.d/case/eofact_c.c-C-G0--goto-backend.exp
index 2c372a0f..2c372a0f 100644
--- a/test/cases/rlhc.d/case/eofact_c.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/eofact_c.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_c.c-C-G0--goto-backend.in b/test/rlhc.d/case/eofact_c.c-C-G0--goto-backend.in
index 1a1ac6e0..1a1ac6e0 100644
--- a/test/cases/rlhc.d/case/eofact_c.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/eofact_c.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_c.c-C-G1--goto-backend.exp b/test/rlhc.d/case/eofact_c.c-C-G1--goto-backend.exp
index 9e5991d8..9e5991d8 100644
--- a/test/cases/rlhc.d/case/eofact_c.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/eofact_c.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_c.c-C-G1--goto-backend.in b/test/rlhc.d/case/eofact_c.c-C-G1--goto-backend.in
index 2b24d54f..2b24d54f 100644
--- a/test/cases/rlhc.d/case/eofact_c.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/eofact_c.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_c.c-C-G2--goto-backend.exp b/test/rlhc.d/case/eofact_c.c-C-G2--goto-backend.exp
index 8b66c7a4..8b66c7a4 100644
--- a/test/cases/rlhc.d/case/eofact_c.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/eofact_c.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_c.c-C-G2--goto-backend.in b/test/rlhc.d/case/eofact_c.c-C-G2--goto-backend.in
index 40cabbc9..40cabbc9 100644
--- a/test/cases/rlhc.d/case/eofact_c.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/eofact_c.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_c.c-C-T0--goto-backend.exp b/test/rlhc.d/case/eofact_c.c-C-T0--goto-backend.exp
index 47506922..47506922 100644
--- a/test/cases/rlhc.d/case/eofact_c.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/eofact_c.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_c.c-C-T0--goto-backend.in b/test/rlhc.d/case/eofact_c.c-C-T0--goto-backend.in
index 564bb121..564bb121 100644
--- a/test/cases/rlhc.d/case/eofact_c.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/eofact_c.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_c.c-C-T0--var-backend.exp b/test/rlhc.d/case/eofact_c.c-C-T0--var-backend.exp
index 7eb0e0d5..7eb0e0d5 100644
--- a/test/cases/rlhc.d/case/eofact_c.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/eofact_c.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_c.c-C-T0--var-backend.in b/test/rlhc.d/case/eofact_c.c-C-T0--var-backend.in
index 702ccccd..702ccccd 100644
--- a/test/cases/rlhc.d/case/eofact_c.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/eofact_c.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_c.c-C-T1--goto-backend.exp b/test/rlhc.d/case/eofact_c.c-C-T1--goto-backend.exp
index 8f49df6c..8f49df6c 100644
--- a/test/cases/rlhc.d/case/eofact_c.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/eofact_c.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_c.c-C-T1--goto-backend.in b/test/rlhc.d/case/eofact_c.c-C-T1--goto-backend.in
index f14e5117..f14e5117 100644
--- a/test/cases/rlhc.d/case/eofact_c.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/eofact_c.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_c.c-C-T1--var-backend.exp b/test/rlhc.d/case/eofact_c.c-C-T1--var-backend.exp
index 3c45e986..3c45e986 100644
--- a/test/cases/rlhc.d/case/eofact_c.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/eofact_c.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_c.c-C-T1--var-backend.in b/test/rlhc.d/case/eofact_c.c-C-T1--var-backend.in
index 8e826a80..8e826a80 100644
--- a/test/cases/rlhc.d/case/eofact_c.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/eofact_c.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_crack.crk-K-F0--var-backend.exp b/test/rlhc.d/case/eofact_crack.crk-K-F0--var-backend.exp
index 7a8cccf9..7a8cccf9 100644
--- a/test/cases/rlhc.d/case/eofact_crack.crk-K-F0--var-backend.exp
+++ b/test/rlhc.d/case/eofact_crack.crk-K-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_crack.crk-K-F0--var-backend.in b/test/rlhc.d/case/eofact_crack.crk-K-F0--var-backend.in
index eceec84d..eceec84d 100644
--- a/test/cases/rlhc.d/case/eofact_crack.crk-K-F0--var-backend.in
+++ b/test/rlhc.d/case/eofact_crack.crk-K-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_crack.crk-K-F1--var-backend.exp b/test/rlhc.d/case/eofact_crack.crk-K-F1--var-backend.exp
index 97cc9db3..97cc9db3 100644
--- a/test/cases/rlhc.d/case/eofact_crack.crk-K-F1--var-backend.exp
+++ b/test/rlhc.d/case/eofact_crack.crk-K-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_crack.crk-K-F1--var-backend.in b/test/rlhc.d/case/eofact_crack.crk-K-F1--var-backend.in
index cfaa16a1..cfaa16a1 100644
--- a/test/cases/rlhc.d/case/eofact_crack.crk-K-F1--var-backend.in
+++ b/test/rlhc.d/case/eofact_crack.crk-K-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_crack.crk-K-T0--var-backend.exp b/test/rlhc.d/case/eofact_crack.crk-K-T0--var-backend.exp
index ec23257d..ec23257d 100644
--- a/test/cases/rlhc.d/case/eofact_crack.crk-K-T0--var-backend.exp
+++ b/test/rlhc.d/case/eofact_crack.crk-K-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_crack.crk-K-T0--var-backend.in b/test/rlhc.d/case/eofact_crack.crk-K-T0--var-backend.in
index 6db77a3b..6db77a3b 100644
--- a/test/cases/rlhc.d/case/eofact_crack.crk-K-T0--var-backend.in
+++ b/test/rlhc.d/case/eofact_crack.crk-K-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_crack.crk-K-T1--var-backend.exp b/test/rlhc.d/case/eofact_crack.crk-K-T1--var-backend.exp
index ba3a71fa..ba3a71fa 100644
--- a/test/cases/rlhc.d/case/eofact_crack.crk-K-T1--var-backend.exp
+++ b/test/rlhc.d/case/eofact_crack.crk-K-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_crack.crk-K-T1--var-backend.in b/test/rlhc.d/case/eofact_crack.crk-K-T1--var-backend.in
index c224726b..c224726b 100644
--- a/test/cases/rlhc.d/case/eofact_crack.crk-K-T1--var-backend.in
+++ b/test/rlhc.d/case/eofact_crack.crk-K-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_cs.cs-A-F0--goto-backend.exp b/test/rlhc.d/case/eofact_cs.cs-A-F0--goto-backend.exp
index 66240da4..66240da4 100644
--- a/test/cases/rlhc.d/case/eofact_cs.cs-A-F0--goto-backend.exp
+++ b/test/rlhc.d/case/eofact_cs.cs-A-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_cs.cs-A-F0--goto-backend.in b/test/rlhc.d/case/eofact_cs.cs-A-F0--goto-backend.in
index 64fb7d81..64fb7d81 100644
--- a/test/cases/rlhc.d/case/eofact_cs.cs-A-F0--goto-backend.in
+++ b/test/rlhc.d/case/eofact_cs.cs-A-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_cs.cs-A-F0--var-backend.exp b/test/rlhc.d/case/eofact_cs.cs-A-F0--var-backend.exp
index 78aebabd..78aebabd 100644
--- a/test/cases/rlhc.d/case/eofact_cs.cs-A-F0--var-backend.exp
+++ b/test/rlhc.d/case/eofact_cs.cs-A-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_cs.cs-A-F0--var-backend.in b/test/rlhc.d/case/eofact_cs.cs-A-F0--var-backend.in
index b77ae72c..b77ae72c 100644
--- a/test/cases/rlhc.d/case/eofact_cs.cs-A-F0--var-backend.in
+++ b/test/rlhc.d/case/eofact_cs.cs-A-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_cs.cs-A-F1--goto-backend.exp b/test/rlhc.d/case/eofact_cs.cs-A-F1--goto-backend.exp
index c3ffe009..c3ffe009 100644
--- a/test/cases/rlhc.d/case/eofact_cs.cs-A-F1--goto-backend.exp
+++ b/test/rlhc.d/case/eofact_cs.cs-A-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_cs.cs-A-F1--goto-backend.in b/test/rlhc.d/case/eofact_cs.cs-A-F1--goto-backend.in
index fd584916..fd584916 100644
--- a/test/cases/rlhc.d/case/eofact_cs.cs-A-F1--goto-backend.in
+++ b/test/rlhc.d/case/eofact_cs.cs-A-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_cs.cs-A-F1--var-backend.exp b/test/rlhc.d/case/eofact_cs.cs-A-F1--var-backend.exp
index 4fb369dc..4fb369dc 100644
--- a/test/cases/rlhc.d/case/eofact_cs.cs-A-F1--var-backend.exp
+++ b/test/rlhc.d/case/eofact_cs.cs-A-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_cs.cs-A-F1--var-backend.in b/test/rlhc.d/case/eofact_cs.cs-A-F1--var-backend.in
index 0064b9d1..0064b9d1 100644
--- a/test/cases/rlhc.d/case/eofact_cs.cs-A-F1--var-backend.in
+++ b/test/rlhc.d/case/eofact_cs.cs-A-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_cs.cs-A-G0--goto-backend.exp b/test/rlhc.d/case/eofact_cs.cs-A-G0--goto-backend.exp
index ee7434dc..ee7434dc 100644
--- a/test/cases/rlhc.d/case/eofact_cs.cs-A-G0--goto-backend.exp
+++ b/test/rlhc.d/case/eofact_cs.cs-A-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_cs.cs-A-G0--goto-backend.in b/test/rlhc.d/case/eofact_cs.cs-A-G0--goto-backend.in
index 48f4bd31..48f4bd31 100644
--- a/test/cases/rlhc.d/case/eofact_cs.cs-A-G0--goto-backend.in
+++ b/test/rlhc.d/case/eofact_cs.cs-A-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_cs.cs-A-G1--goto-backend.exp b/test/rlhc.d/case/eofact_cs.cs-A-G1--goto-backend.exp
index 778b6b45..778b6b45 100644
--- a/test/cases/rlhc.d/case/eofact_cs.cs-A-G1--goto-backend.exp
+++ b/test/rlhc.d/case/eofact_cs.cs-A-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_cs.cs-A-G1--goto-backend.in b/test/rlhc.d/case/eofact_cs.cs-A-G1--goto-backend.in
index e073150f..e073150f 100644
--- a/test/cases/rlhc.d/case/eofact_cs.cs-A-G1--goto-backend.in
+++ b/test/rlhc.d/case/eofact_cs.cs-A-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_cs.cs-A-T0--goto-backend.exp b/test/rlhc.d/case/eofact_cs.cs-A-T0--goto-backend.exp
index a0918040..a0918040 100644
--- a/test/cases/rlhc.d/case/eofact_cs.cs-A-T0--goto-backend.exp
+++ b/test/rlhc.d/case/eofact_cs.cs-A-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_cs.cs-A-T0--goto-backend.in b/test/rlhc.d/case/eofact_cs.cs-A-T0--goto-backend.in
index 3bacabbc..3bacabbc 100644
--- a/test/cases/rlhc.d/case/eofact_cs.cs-A-T0--goto-backend.in
+++ b/test/rlhc.d/case/eofact_cs.cs-A-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_cs.cs-A-T0--var-backend.exp b/test/rlhc.d/case/eofact_cs.cs-A-T0--var-backend.exp
index ee34cf4d..ee34cf4d 100644
--- a/test/cases/rlhc.d/case/eofact_cs.cs-A-T0--var-backend.exp
+++ b/test/rlhc.d/case/eofact_cs.cs-A-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_cs.cs-A-T0--var-backend.in b/test/rlhc.d/case/eofact_cs.cs-A-T0--var-backend.in
index 58c41302..58c41302 100644
--- a/test/cases/rlhc.d/case/eofact_cs.cs-A-T0--var-backend.in
+++ b/test/rlhc.d/case/eofact_cs.cs-A-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_cs.cs-A-T1--goto-backend.exp b/test/rlhc.d/case/eofact_cs.cs-A-T1--goto-backend.exp
index 47b054cc..47b054cc 100644
--- a/test/cases/rlhc.d/case/eofact_cs.cs-A-T1--goto-backend.exp
+++ b/test/rlhc.d/case/eofact_cs.cs-A-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_cs.cs-A-T1--goto-backend.in b/test/rlhc.d/case/eofact_cs.cs-A-T1--goto-backend.in
index 804ff2c8..804ff2c8 100644
--- a/test/cases/rlhc.d/case/eofact_cs.cs-A-T1--goto-backend.in
+++ b/test/rlhc.d/case/eofact_cs.cs-A-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_cs.cs-A-T1--var-backend.exp b/test/rlhc.d/case/eofact_cs.cs-A-T1--var-backend.exp
index 100d7c6f..100d7c6f 100644
--- a/test/cases/rlhc.d/case/eofact_cs.cs-A-T1--var-backend.exp
+++ b/test/rlhc.d/case/eofact_cs.cs-A-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_cs.cs-A-T1--var-backend.in b/test/rlhc.d/case/eofact_cs.cs-A-T1--var-backend.in
index 59110104..59110104 100644
--- a/test/cases/rlhc.d/case/eofact_cs.cs-A-T1--var-backend.in
+++ b/test/rlhc.d/case/eofact_cs.cs-A-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_go.go-Z-F0--goto-backend.exp b/test/rlhc.d/case/eofact_go.go-Z-F0--goto-backend.exp
index 7a58e77d..7a58e77d 100644
--- a/test/cases/rlhc.d/case/eofact_go.go-Z-F0--goto-backend.exp
+++ b/test/rlhc.d/case/eofact_go.go-Z-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_go.go-Z-F0--goto-backend.in b/test/rlhc.d/case/eofact_go.go-Z-F0--goto-backend.in
index 5ed15817..5ed15817 100644
--- a/test/cases/rlhc.d/case/eofact_go.go-Z-F0--goto-backend.in
+++ b/test/rlhc.d/case/eofact_go.go-Z-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_go.go-Z-F0--var-backend.exp b/test/rlhc.d/case/eofact_go.go-Z-F0--var-backend.exp
index eaaafca5..eaaafca5 100644
--- a/test/cases/rlhc.d/case/eofact_go.go-Z-F0--var-backend.exp
+++ b/test/rlhc.d/case/eofact_go.go-Z-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_go.go-Z-F0--var-backend.in b/test/rlhc.d/case/eofact_go.go-Z-F0--var-backend.in
index a74bcee9..a74bcee9 100644
--- a/test/cases/rlhc.d/case/eofact_go.go-Z-F0--var-backend.in
+++ b/test/rlhc.d/case/eofact_go.go-Z-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_go.go-Z-F1--goto-backend.exp b/test/rlhc.d/case/eofact_go.go-Z-F1--goto-backend.exp
index 3e17c6ee..3e17c6ee 100644
--- a/test/cases/rlhc.d/case/eofact_go.go-Z-F1--goto-backend.exp
+++ b/test/rlhc.d/case/eofact_go.go-Z-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_go.go-Z-F1--goto-backend.in b/test/rlhc.d/case/eofact_go.go-Z-F1--goto-backend.in
index 1d4f674e..1d4f674e 100644
--- a/test/cases/rlhc.d/case/eofact_go.go-Z-F1--goto-backend.in
+++ b/test/rlhc.d/case/eofact_go.go-Z-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_go.go-Z-F1--var-backend.exp b/test/rlhc.d/case/eofact_go.go-Z-F1--var-backend.exp
index 2170fb91..2170fb91 100644
--- a/test/cases/rlhc.d/case/eofact_go.go-Z-F1--var-backend.exp
+++ b/test/rlhc.d/case/eofact_go.go-Z-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_go.go-Z-F1--var-backend.in b/test/rlhc.d/case/eofact_go.go-Z-F1--var-backend.in
index eeeb6741..eeeb6741 100644
--- a/test/cases/rlhc.d/case/eofact_go.go-Z-F1--var-backend.in
+++ b/test/rlhc.d/case/eofact_go.go-Z-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_go.go-Z-G0--goto-backend.exp b/test/rlhc.d/case/eofact_go.go-Z-G0--goto-backend.exp
index bf4c77a8..bf4c77a8 100644
--- a/test/cases/rlhc.d/case/eofact_go.go-Z-G0--goto-backend.exp
+++ b/test/rlhc.d/case/eofact_go.go-Z-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_go.go-Z-G0--goto-backend.in b/test/rlhc.d/case/eofact_go.go-Z-G0--goto-backend.in
index aff5d6dc..aff5d6dc 100644
--- a/test/cases/rlhc.d/case/eofact_go.go-Z-G0--goto-backend.in
+++ b/test/rlhc.d/case/eofact_go.go-Z-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_go.go-Z-G1--goto-backend.exp b/test/rlhc.d/case/eofact_go.go-Z-G1--goto-backend.exp
index 47ef0cee..47ef0cee 100644
--- a/test/cases/rlhc.d/case/eofact_go.go-Z-G1--goto-backend.exp
+++ b/test/rlhc.d/case/eofact_go.go-Z-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_go.go-Z-G1--goto-backend.in b/test/rlhc.d/case/eofact_go.go-Z-G1--goto-backend.in
index bb7ca6b3..bb7ca6b3 100644
--- a/test/cases/rlhc.d/case/eofact_go.go-Z-G1--goto-backend.in
+++ b/test/rlhc.d/case/eofact_go.go-Z-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_go.go-Z-G2--goto-backend.exp b/test/rlhc.d/case/eofact_go.go-Z-G2--goto-backend.exp
index d674dad5..d674dad5 100644
--- a/test/cases/rlhc.d/case/eofact_go.go-Z-G2--goto-backend.exp
+++ b/test/rlhc.d/case/eofact_go.go-Z-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_go.go-Z-G2--goto-backend.in b/test/rlhc.d/case/eofact_go.go-Z-G2--goto-backend.in
index ca32a848..ca32a848 100644
--- a/test/cases/rlhc.d/case/eofact_go.go-Z-G2--goto-backend.in
+++ b/test/rlhc.d/case/eofact_go.go-Z-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_go.go-Z-T0--goto-backend.exp b/test/rlhc.d/case/eofact_go.go-Z-T0--goto-backend.exp
index bff52c99..bff52c99 100644
--- a/test/cases/rlhc.d/case/eofact_go.go-Z-T0--goto-backend.exp
+++ b/test/rlhc.d/case/eofact_go.go-Z-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_go.go-Z-T0--goto-backend.in b/test/rlhc.d/case/eofact_go.go-Z-T0--goto-backend.in
index f5a85c8b..f5a85c8b 100644
--- a/test/cases/rlhc.d/case/eofact_go.go-Z-T0--goto-backend.in
+++ b/test/rlhc.d/case/eofact_go.go-Z-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_go.go-Z-T0--var-backend.exp b/test/rlhc.d/case/eofact_go.go-Z-T0--var-backend.exp
index 1cae9f83..1cae9f83 100644
--- a/test/cases/rlhc.d/case/eofact_go.go-Z-T0--var-backend.exp
+++ b/test/rlhc.d/case/eofact_go.go-Z-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_go.go-Z-T0--var-backend.in b/test/rlhc.d/case/eofact_go.go-Z-T0--var-backend.in
index 73db15f3..73db15f3 100644
--- a/test/cases/rlhc.d/case/eofact_go.go-Z-T0--var-backend.in
+++ b/test/rlhc.d/case/eofact_go.go-Z-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_go.go-Z-T1--goto-backend.exp b/test/rlhc.d/case/eofact_go.go-Z-T1--goto-backend.exp
index 5fc02662..5fc02662 100644
--- a/test/cases/rlhc.d/case/eofact_go.go-Z-T1--goto-backend.exp
+++ b/test/rlhc.d/case/eofact_go.go-Z-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_go.go-Z-T1--goto-backend.in b/test/rlhc.d/case/eofact_go.go-Z-T1--goto-backend.in
index 5f240bc1..5f240bc1 100644
--- a/test/cases/rlhc.d/case/eofact_go.go-Z-T1--goto-backend.in
+++ b/test/rlhc.d/case/eofact_go.go-Z-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_go.go-Z-T1--var-backend.exp b/test/rlhc.d/case/eofact_go.go-Z-T1--var-backend.exp
index 03ad3590..03ad3590 100644
--- a/test/cases/rlhc.d/case/eofact_go.go-Z-T1--var-backend.exp
+++ b/test/rlhc.d/case/eofact_go.go-Z-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_go.go-Z-T1--var-backend.in b/test/rlhc.d/case/eofact_go.go-Z-T1--var-backend.in
index d5fc179d..d5fc179d 100644
--- a/test/cases/rlhc.d/case/eofact_go.go-Z-T1--var-backend.in
+++ b/test/rlhc.d/case/eofact_go.go-Z-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_java.java-J-F0--goto-backend.exp b/test/rlhc.d/case/eofact_java.java-J-F0--goto-backend.exp
index 39781de6..39781de6 100644
--- a/test/cases/rlhc.d/case/eofact_java.java-J-F0--goto-backend.exp
+++ b/test/rlhc.d/case/eofact_java.java-J-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_java.java-J-F0--goto-backend.in b/test/rlhc.d/case/eofact_java.java-J-F0--goto-backend.in
index f9bad95f..f9bad95f 100644
--- a/test/cases/rlhc.d/case/eofact_java.java-J-F0--goto-backend.in
+++ b/test/rlhc.d/case/eofact_java.java-J-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_java.java-J-F0--var-backend.exp b/test/rlhc.d/case/eofact_java.java-J-F0--var-backend.exp
index 0b30f97a..0b30f97a 100644
--- a/test/cases/rlhc.d/case/eofact_java.java-J-F0--var-backend.exp
+++ b/test/rlhc.d/case/eofact_java.java-J-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_java.java-J-F0--var-backend.in b/test/rlhc.d/case/eofact_java.java-J-F0--var-backend.in
index d64babf6..d64babf6 100644
--- a/test/cases/rlhc.d/case/eofact_java.java-J-F0--var-backend.in
+++ b/test/rlhc.d/case/eofact_java.java-J-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_java.java-J-F1--goto-backend.exp b/test/rlhc.d/case/eofact_java.java-J-F1--goto-backend.exp
index c814ea69..c814ea69 100644
--- a/test/cases/rlhc.d/case/eofact_java.java-J-F1--goto-backend.exp
+++ b/test/rlhc.d/case/eofact_java.java-J-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_java.java-J-F1--goto-backend.in b/test/rlhc.d/case/eofact_java.java-J-F1--goto-backend.in
index 8e005165..8e005165 100644
--- a/test/cases/rlhc.d/case/eofact_java.java-J-F1--goto-backend.in
+++ b/test/rlhc.d/case/eofact_java.java-J-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_java.java-J-F1--var-backend.exp b/test/rlhc.d/case/eofact_java.java-J-F1--var-backend.exp
index 4076af1f..4076af1f 100644
--- a/test/cases/rlhc.d/case/eofact_java.java-J-F1--var-backend.exp
+++ b/test/rlhc.d/case/eofact_java.java-J-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_java.java-J-F1--var-backend.in b/test/rlhc.d/case/eofact_java.java-J-F1--var-backend.in
index 9cc15f22..9cc15f22 100644
--- a/test/cases/rlhc.d/case/eofact_java.java-J-F1--var-backend.in
+++ b/test/rlhc.d/case/eofact_java.java-J-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_java.java-J-T0--goto-backend.exp b/test/rlhc.d/case/eofact_java.java-J-T0--goto-backend.exp
index 0ccd681a..0ccd681a 100644
--- a/test/cases/rlhc.d/case/eofact_java.java-J-T0--goto-backend.exp
+++ b/test/rlhc.d/case/eofact_java.java-J-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_java.java-J-T0--goto-backend.in b/test/rlhc.d/case/eofact_java.java-J-T0--goto-backend.in
index d5be3ef2..d5be3ef2 100644
--- a/test/cases/rlhc.d/case/eofact_java.java-J-T0--goto-backend.in
+++ b/test/rlhc.d/case/eofact_java.java-J-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_java.java-J-T0--var-backend.exp b/test/rlhc.d/case/eofact_java.java-J-T0--var-backend.exp
index d447f5a2..d447f5a2 100644
--- a/test/cases/rlhc.d/case/eofact_java.java-J-T0--var-backend.exp
+++ b/test/rlhc.d/case/eofact_java.java-J-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_java.java-J-T0--var-backend.in b/test/rlhc.d/case/eofact_java.java-J-T0--var-backend.in
index c33525d3..c33525d3 100644
--- a/test/cases/rlhc.d/case/eofact_java.java-J-T0--var-backend.in
+++ b/test/rlhc.d/case/eofact_java.java-J-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_java.java-J-T1--goto-backend.exp b/test/rlhc.d/case/eofact_java.java-J-T1--goto-backend.exp
index afae53c0..afae53c0 100644
--- a/test/cases/rlhc.d/case/eofact_java.java-J-T1--goto-backend.exp
+++ b/test/rlhc.d/case/eofact_java.java-J-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_java.java-J-T1--goto-backend.in b/test/rlhc.d/case/eofact_java.java-J-T1--goto-backend.in
index 6d560a83..6d560a83 100644
--- a/test/cases/rlhc.d/case/eofact_java.java-J-T1--goto-backend.in
+++ b/test/rlhc.d/case/eofact_java.java-J-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_java.java-J-T1--var-backend.exp b/test/rlhc.d/case/eofact_java.java-J-T1--var-backend.exp
index bf34d7ff..bf34d7ff 100644
--- a/test/cases/rlhc.d/case/eofact_java.java-J-T1--var-backend.exp
+++ b/test/rlhc.d/case/eofact_java.java-J-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_java.java-J-T1--var-backend.in b/test/rlhc.d/case/eofact_java.java-J-T1--var-backend.in
index 3b5503da..3b5503da 100644
--- a/test/cases/rlhc.d/case/eofact_java.java-J-T1--var-backend.in
+++ b/test/rlhc.d/case/eofact_java.java-J-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_julia.jl-Y-F0--var-backend.exp b/test/rlhc.d/case/eofact_julia.jl-Y-F0--var-backend.exp
index 4acfc90a..4acfc90a 100644
--- a/test/cases/rlhc.d/case/eofact_julia.jl-Y-F0--var-backend.exp
+++ b/test/rlhc.d/case/eofact_julia.jl-Y-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_julia.jl-Y-F0--var-backend.in b/test/rlhc.d/case/eofact_julia.jl-Y-F0--var-backend.in
index 81e18fe1..81e18fe1 100644
--- a/test/cases/rlhc.d/case/eofact_julia.jl-Y-F0--var-backend.in
+++ b/test/rlhc.d/case/eofact_julia.jl-Y-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_julia.jl-Y-F1--var-backend.exp b/test/rlhc.d/case/eofact_julia.jl-Y-F1--var-backend.exp
index ffc8ff7a..ffc8ff7a 100644
--- a/test/cases/rlhc.d/case/eofact_julia.jl-Y-F1--var-backend.exp
+++ b/test/rlhc.d/case/eofact_julia.jl-Y-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_julia.jl-Y-F1--var-backend.in b/test/rlhc.d/case/eofact_julia.jl-Y-F1--var-backend.in
index 52b87a2f..52b87a2f 100644
--- a/test/cases/rlhc.d/case/eofact_julia.jl-Y-F1--var-backend.in
+++ b/test/rlhc.d/case/eofact_julia.jl-Y-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_julia.jl-Y-T0--var-backend.exp b/test/rlhc.d/case/eofact_julia.jl-Y-T0--var-backend.exp
index 4c05f6a8..4c05f6a8 100644
--- a/test/cases/rlhc.d/case/eofact_julia.jl-Y-T0--var-backend.exp
+++ b/test/rlhc.d/case/eofact_julia.jl-Y-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_julia.jl-Y-T0--var-backend.in b/test/rlhc.d/case/eofact_julia.jl-Y-T0--var-backend.in
index ca0caf00..ca0caf00 100644
--- a/test/cases/rlhc.d/case/eofact_julia.jl-Y-T0--var-backend.in
+++ b/test/rlhc.d/case/eofact_julia.jl-Y-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_julia.jl-Y-T1--var-backend.exp b/test/rlhc.d/case/eofact_julia.jl-Y-T1--var-backend.exp
index 16f5d60a..16f5d60a 100644
--- a/test/cases/rlhc.d/case/eofact_julia.jl-Y-T1--var-backend.exp
+++ b/test/rlhc.d/case/eofact_julia.jl-Y-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_julia.jl-Y-T1--var-backend.in b/test/rlhc.d/case/eofact_julia.jl-Y-T1--var-backend.in
index b8464fda..b8464fda 100644
--- a/test/cases/rlhc.d/case/eofact_julia.jl-Y-T1--var-backend.in
+++ b/test/rlhc.d/case/eofact_julia.jl-Y-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_ocaml.ml-O-F0--var-backend.exp b/test/rlhc.d/case/eofact_ocaml.ml-O-F0--var-backend.exp
index 490d6b41..490d6b41 100644
--- a/test/cases/rlhc.d/case/eofact_ocaml.ml-O-F0--var-backend.exp
+++ b/test/rlhc.d/case/eofact_ocaml.ml-O-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_ocaml.ml-O-F0--var-backend.in b/test/rlhc.d/case/eofact_ocaml.ml-O-F0--var-backend.in
index dd0cd94d..dd0cd94d 100644
--- a/test/cases/rlhc.d/case/eofact_ocaml.ml-O-F0--var-backend.in
+++ b/test/rlhc.d/case/eofact_ocaml.ml-O-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_ocaml.ml-O-F1--var-backend.exp b/test/rlhc.d/case/eofact_ocaml.ml-O-F1--var-backend.exp
index 0859f7a6..0859f7a6 100644
--- a/test/cases/rlhc.d/case/eofact_ocaml.ml-O-F1--var-backend.exp
+++ b/test/rlhc.d/case/eofact_ocaml.ml-O-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_ocaml.ml-O-F1--var-backend.in b/test/rlhc.d/case/eofact_ocaml.ml-O-F1--var-backend.in
index 9b759f5e..9b759f5e 100644
--- a/test/cases/rlhc.d/case/eofact_ocaml.ml-O-F1--var-backend.in
+++ b/test/rlhc.d/case/eofact_ocaml.ml-O-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_ocaml.ml-O-T0--var-backend.exp b/test/rlhc.d/case/eofact_ocaml.ml-O-T0--var-backend.exp
index 4aa632ff..4aa632ff 100644
--- a/test/cases/rlhc.d/case/eofact_ocaml.ml-O-T0--var-backend.exp
+++ b/test/rlhc.d/case/eofact_ocaml.ml-O-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_ocaml.ml-O-T0--var-backend.in b/test/rlhc.d/case/eofact_ocaml.ml-O-T0--var-backend.in
index 18ae25ea..18ae25ea 100644
--- a/test/cases/rlhc.d/case/eofact_ocaml.ml-O-T0--var-backend.in
+++ b/test/rlhc.d/case/eofact_ocaml.ml-O-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_ocaml.ml-O-T1--var-backend.exp b/test/rlhc.d/case/eofact_ocaml.ml-O-T1--var-backend.exp
index a6a41633..a6a41633 100644
--- a/test/cases/rlhc.d/case/eofact_ocaml.ml-O-T1--var-backend.exp
+++ b/test/rlhc.d/case/eofact_ocaml.ml-O-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_ocaml.ml-O-T1--var-backend.in b/test/rlhc.d/case/eofact_ocaml.ml-O-T1--var-backend.in
index b3ad9a4f..b3ad9a4f 100644
--- a/test/cases/rlhc.d/case/eofact_ocaml.ml-O-T1--var-backend.in
+++ b/test/rlhc.d/case/eofact_ocaml.ml-O-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_ruby.rb-R-F0--var-backend.exp b/test/rlhc.d/case/eofact_ruby.rb-R-F0--var-backend.exp
index 9691710b..9691710b 100644
--- a/test/cases/rlhc.d/case/eofact_ruby.rb-R-F0--var-backend.exp
+++ b/test/rlhc.d/case/eofact_ruby.rb-R-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_ruby.rb-R-F0--var-backend.in b/test/rlhc.d/case/eofact_ruby.rb-R-F0--var-backend.in
index 26eeec46..26eeec46 100644
--- a/test/cases/rlhc.d/case/eofact_ruby.rb-R-F0--var-backend.in
+++ b/test/rlhc.d/case/eofact_ruby.rb-R-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_ruby.rb-R-F1--var-backend.exp b/test/rlhc.d/case/eofact_ruby.rb-R-F1--var-backend.exp
index 60ae9f23..60ae9f23 100644
--- a/test/cases/rlhc.d/case/eofact_ruby.rb-R-F1--var-backend.exp
+++ b/test/rlhc.d/case/eofact_ruby.rb-R-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_ruby.rb-R-F1--var-backend.in b/test/rlhc.d/case/eofact_ruby.rb-R-F1--var-backend.in
index 7951db0e..7951db0e 100644
--- a/test/cases/rlhc.d/case/eofact_ruby.rb-R-F1--var-backend.in
+++ b/test/rlhc.d/case/eofact_ruby.rb-R-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_ruby.rb-R-T0--var-backend.exp b/test/rlhc.d/case/eofact_ruby.rb-R-T0--var-backend.exp
index cb4b68aa..cb4b68aa 100644
--- a/test/cases/rlhc.d/case/eofact_ruby.rb-R-T0--var-backend.exp
+++ b/test/rlhc.d/case/eofact_ruby.rb-R-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_ruby.rb-R-T0--var-backend.in b/test/rlhc.d/case/eofact_ruby.rb-R-T0--var-backend.in
index 675d2714..675d2714 100644
--- a/test/cases/rlhc.d/case/eofact_ruby.rb-R-T0--var-backend.in
+++ b/test/rlhc.d/case/eofact_ruby.rb-R-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_ruby.rb-R-T1--var-backend.exp b/test/rlhc.d/case/eofact_ruby.rb-R-T1--var-backend.exp
index 69818730..69818730 100644
--- a/test/cases/rlhc.d/case/eofact_ruby.rb-R-T1--var-backend.exp
+++ b/test/rlhc.d/case/eofact_ruby.rb-R-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_ruby.rb-R-T1--var-backend.in b/test/rlhc.d/case/eofact_ruby.rb-R-T1--var-backend.in
index 3022f5a2..3022f5a2 100644
--- a/test/cases/rlhc.d/case/eofact_ruby.rb-R-T1--var-backend.in
+++ b/test/rlhc.d/case/eofact_ruby.rb-R-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_rust.rs-U-F0--var-backend.exp b/test/rlhc.d/case/eofact_rust.rs-U-F0--var-backend.exp
index 49112973..49112973 100644
--- a/test/cases/rlhc.d/case/eofact_rust.rs-U-F0--var-backend.exp
+++ b/test/rlhc.d/case/eofact_rust.rs-U-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_rust.rs-U-F0--var-backend.in b/test/rlhc.d/case/eofact_rust.rs-U-F0--var-backend.in
index 868413f1..868413f1 100644
--- a/test/cases/rlhc.d/case/eofact_rust.rs-U-F0--var-backend.in
+++ b/test/rlhc.d/case/eofact_rust.rs-U-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_rust.rs-U-F1--var-backend.exp b/test/rlhc.d/case/eofact_rust.rs-U-F1--var-backend.exp
index c3036b43..c3036b43 100644
--- a/test/cases/rlhc.d/case/eofact_rust.rs-U-F1--var-backend.exp
+++ b/test/rlhc.d/case/eofact_rust.rs-U-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_rust.rs-U-F1--var-backend.in b/test/rlhc.d/case/eofact_rust.rs-U-F1--var-backend.in
index 8e76d14e..8e76d14e 100644
--- a/test/cases/rlhc.d/case/eofact_rust.rs-U-F1--var-backend.in
+++ b/test/rlhc.d/case/eofact_rust.rs-U-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_rust.rs-U-T0--var-backend.exp b/test/rlhc.d/case/eofact_rust.rs-U-T0--var-backend.exp
index f45b22ca..f45b22ca 100644
--- a/test/cases/rlhc.d/case/eofact_rust.rs-U-T0--var-backend.exp
+++ b/test/rlhc.d/case/eofact_rust.rs-U-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_rust.rs-U-T0--var-backend.in b/test/rlhc.d/case/eofact_rust.rs-U-T0--var-backend.in
index 8023f111..8023f111 100644
--- a/test/cases/rlhc.d/case/eofact_rust.rs-U-T0--var-backend.in
+++ b/test/rlhc.d/case/eofact_rust.rs-U-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/eofact_rust.rs-U-T1--var-backend.exp b/test/rlhc.d/case/eofact_rust.rs-U-T1--var-backend.exp
index fba2a9b6..fba2a9b6 100644
--- a/test/cases/rlhc.d/case/eofact_rust.rs-U-T1--var-backend.exp
+++ b/test/rlhc.d/case/eofact_rust.rs-U-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/eofact_rust.rs-U-T1--var-backend.in b/test/rlhc.d/case/eofact_rust.rs-U-T1--var-backend.in
index a5f14ac0..a5f14ac0 100644
--- a/test/cases/rlhc.d/case/eofact_rust.rs-U-T1--var-backend.in
+++ b/test/rlhc.d/case/eofact_rust.rs-U-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract1.cpp-C-F0--goto-backend.exp b/test/rlhc.d/case/erract1.cpp-C-F0--goto-backend.exp
index 5fe5b1c3..5fe5b1c3 100644
--- a/test/cases/rlhc.d/case/erract1.cpp-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/erract1.cpp-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract1.cpp-C-F0--goto-backend.in b/test/rlhc.d/case/erract1.cpp-C-F0--goto-backend.in
index 56ac0951..56ac0951 100644
--- a/test/cases/rlhc.d/case/erract1.cpp-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/erract1.cpp-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract1.cpp-C-F0--var-backend.exp b/test/rlhc.d/case/erract1.cpp-C-F0--var-backend.exp
index 85912fe5..85912fe5 100644
--- a/test/cases/rlhc.d/case/erract1.cpp-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/erract1.cpp-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract1.cpp-C-F0--var-backend.in b/test/rlhc.d/case/erract1.cpp-C-F0--var-backend.in
index 43cd60b8..43cd60b8 100644
--- a/test/cases/rlhc.d/case/erract1.cpp-C-F0--var-backend.in
+++ b/test/rlhc.d/case/erract1.cpp-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract1.cpp-C-F1--goto-backend.exp b/test/rlhc.d/case/erract1.cpp-C-F1--goto-backend.exp
index d7af0fe6..d7af0fe6 100644
--- a/test/cases/rlhc.d/case/erract1.cpp-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/erract1.cpp-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract1.cpp-C-F1--goto-backend.in b/test/rlhc.d/case/erract1.cpp-C-F1--goto-backend.in
index cfcecf4e..cfcecf4e 100644
--- a/test/cases/rlhc.d/case/erract1.cpp-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/erract1.cpp-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract1.cpp-C-F1--var-backend.exp b/test/rlhc.d/case/erract1.cpp-C-F1--var-backend.exp
index a95881ee..a95881ee 100644
--- a/test/cases/rlhc.d/case/erract1.cpp-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/erract1.cpp-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract1.cpp-C-F1--var-backend.in b/test/rlhc.d/case/erract1.cpp-C-F1--var-backend.in
index c232abfb..c232abfb 100644
--- a/test/cases/rlhc.d/case/erract1.cpp-C-F1--var-backend.in
+++ b/test/rlhc.d/case/erract1.cpp-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract1.cpp-C-G0--goto-backend.exp b/test/rlhc.d/case/erract1.cpp-C-G0--goto-backend.exp
index cfb2ac82..cfb2ac82 100644
--- a/test/cases/rlhc.d/case/erract1.cpp-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/erract1.cpp-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract1.cpp-C-G0--goto-backend.in b/test/rlhc.d/case/erract1.cpp-C-G0--goto-backend.in
index a04a6470..a04a6470 100644
--- a/test/cases/rlhc.d/case/erract1.cpp-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/erract1.cpp-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract1.cpp-C-G1--goto-backend.exp b/test/rlhc.d/case/erract1.cpp-C-G1--goto-backend.exp
index 0b38fdd9..0b38fdd9 100644
--- a/test/cases/rlhc.d/case/erract1.cpp-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/erract1.cpp-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract1.cpp-C-G1--goto-backend.in b/test/rlhc.d/case/erract1.cpp-C-G1--goto-backend.in
index cb6761eb..cb6761eb 100644
--- a/test/cases/rlhc.d/case/erract1.cpp-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/erract1.cpp-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract1.cpp-C-G2--goto-backend.exp b/test/rlhc.d/case/erract1.cpp-C-G2--goto-backend.exp
index b2ebe557..b2ebe557 100644
--- a/test/cases/rlhc.d/case/erract1.cpp-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/erract1.cpp-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract1.cpp-C-G2--goto-backend.in b/test/rlhc.d/case/erract1.cpp-C-G2--goto-backend.in
index 77d7f1b5..77d7f1b5 100644
--- a/test/cases/rlhc.d/case/erract1.cpp-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/erract1.cpp-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract1.cpp-C-T0--goto-backend.exp b/test/rlhc.d/case/erract1.cpp-C-T0--goto-backend.exp
index be6fa621..be6fa621 100644
--- a/test/cases/rlhc.d/case/erract1.cpp-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/erract1.cpp-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract1.cpp-C-T0--goto-backend.in b/test/rlhc.d/case/erract1.cpp-C-T0--goto-backend.in
index 7d3fb98a..7d3fb98a 100644
--- a/test/cases/rlhc.d/case/erract1.cpp-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/erract1.cpp-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract1.cpp-C-T0--var-backend.exp b/test/rlhc.d/case/erract1.cpp-C-T0--var-backend.exp
index d361566b..d361566b 100644
--- a/test/cases/rlhc.d/case/erract1.cpp-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/erract1.cpp-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract1.cpp-C-T0--var-backend.in b/test/rlhc.d/case/erract1.cpp-C-T0--var-backend.in
index c0d358d9..c0d358d9 100644
--- a/test/cases/rlhc.d/case/erract1.cpp-C-T0--var-backend.in
+++ b/test/rlhc.d/case/erract1.cpp-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract1.cpp-C-T1--goto-backend.exp b/test/rlhc.d/case/erract1.cpp-C-T1--goto-backend.exp
index dc1fdb88..dc1fdb88 100644
--- a/test/cases/rlhc.d/case/erract1.cpp-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/erract1.cpp-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract1.cpp-C-T1--goto-backend.in b/test/rlhc.d/case/erract1.cpp-C-T1--goto-backend.in
index 545e8827..545e8827 100644
--- a/test/cases/rlhc.d/case/erract1.cpp-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/erract1.cpp-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract1.cpp-C-T1--var-backend.exp b/test/rlhc.d/case/erract1.cpp-C-T1--var-backend.exp
index 1da07ab7..1da07ab7 100644
--- a/test/cases/rlhc.d/case/erract1.cpp-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/erract1.cpp-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract1.cpp-C-T1--var-backend.in b/test/rlhc.d/case/erract1.cpp-C-T1--var-backend.in
index 302b5bbd..302b5bbd 100644
--- a/test/cases/rlhc.d/case/erract1.cpp-C-T1--var-backend.in
+++ b/test/rlhc.d/case/erract1.cpp-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_c.c-C-F0--goto-backend.exp b/test/rlhc.d/case/erract2_c.c-C-F0--goto-backend.exp
index c1265aaf..c1265aaf 100644
--- a/test/cases/rlhc.d/case/erract2_c.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/erract2_c.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_c.c-C-F0--goto-backend.in b/test/rlhc.d/case/erract2_c.c-C-F0--goto-backend.in
index 13f03fd8..13f03fd8 100644
--- a/test/cases/rlhc.d/case/erract2_c.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/erract2_c.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_c.c-C-F0--var-backend.exp b/test/rlhc.d/case/erract2_c.c-C-F0--var-backend.exp
index e1d38c93..e1d38c93 100644
--- a/test/cases/rlhc.d/case/erract2_c.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/erract2_c.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_c.c-C-F0--var-backend.in b/test/rlhc.d/case/erract2_c.c-C-F0--var-backend.in
index c3a63706..c3a63706 100644
--- a/test/cases/rlhc.d/case/erract2_c.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/erract2_c.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_c.c-C-F1--goto-backend.exp b/test/rlhc.d/case/erract2_c.c-C-F1--goto-backend.exp
index f149652c..f149652c 100644
--- a/test/cases/rlhc.d/case/erract2_c.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/erract2_c.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_c.c-C-F1--goto-backend.in b/test/rlhc.d/case/erract2_c.c-C-F1--goto-backend.in
index c158c331..c158c331 100644
--- a/test/cases/rlhc.d/case/erract2_c.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/erract2_c.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_c.c-C-F1--var-backend.exp b/test/rlhc.d/case/erract2_c.c-C-F1--var-backend.exp
index 8ead6f0f..8ead6f0f 100644
--- a/test/cases/rlhc.d/case/erract2_c.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/erract2_c.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_c.c-C-F1--var-backend.in b/test/rlhc.d/case/erract2_c.c-C-F1--var-backend.in
index 6928a62a..6928a62a 100644
--- a/test/cases/rlhc.d/case/erract2_c.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/erract2_c.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_c.c-C-G0--goto-backend.exp b/test/rlhc.d/case/erract2_c.c-C-G0--goto-backend.exp
index 32843b1d..32843b1d 100644
--- a/test/cases/rlhc.d/case/erract2_c.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/erract2_c.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_c.c-C-G0--goto-backend.in b/test/rlhc.d/case/erract2_c.c-C-G0--goto-backend.in
index d1213bf0..d1213bf0 100644
--- a/test/cases/rlhc.d/case/erract2_c.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/erract2_c.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_c.c-C-G1--goto-backend.exp b/test/rlhc.d/case/erract2_c.c-C-G1--goto-backend.exp
index 35726ee1..35726ee1 100644
--- a/test/cases/rlhc.d/case/erract2_c.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/erract2_c.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_c.c-C-G1--goto-backend.in b/test/rlhc.d/case/erract2_c.c-C-G1--goto-backend.in
index 51dae5a6..51dae5a6 100644
--- a/test/cases/rlhc.d/case/erract2_c.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/erract2_c.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_c.c-C-G2--goto-backend.exp b/test/rlhc.d/case/erract2_c.c-C-G2--goto-backend.exp
index 67eb8953..67eb8953 100644
--- a/test/cases/rlhc.d/case/erract2_c.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/erract2_c.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_c.c-C-G2--goto-backend.in b/test/rlhc.d/case/erract2_c.c-C-G2--goto-backend.in
index 2f6eb5c9..2f6eb5c9 100644
--- a/test/cases/rlhc.d/case/erract2_c.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/erract2_c.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_c.c-C-T0--goto-backend.exp b/test/rlhc.d/case/erract2_c.c-C-T0--goto-backend.exp
index 790e0b02..790e0b02 100644
--- a/test/cases/rlhc.d/case/erract2_c.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/erract2_c.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_c.c-C-T0--goto-backend.in b/test/rlhc.d/case/erract2_c.c-C-T0--goto-backend.in
index 5a97409d..5a97409d 100644
--- a/test/cases/rlhc.d/case/erract2_c.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/erract2_c.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_c.c-C-T0--var-backend.exp b/test/rlhc.d/case/erract2_c.c-C-T0--var-backend.exp
index 09defa90..09defa90 100644
--- a/test/cases/rlhc.d/case/erract2_c.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/erract2_c.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_c.c-C-T0--var-backend.in b/test/rlhc.d/case/erract2_c.c-C-T0--var-backend.in
index d81f97f9..d81f97f9 100644
--- a/test/cases/rlhc.d/case/erract2_c.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/erract2_c.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_c.c-C-T1--goto-backend.exp b/test/rlhc.d/case/erract2_c.c-C-T1--goto-backend.exp
index fec7e826..fec7e826 100644
--- a/test/cases/rlhc.d/case/erract2_c.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/erract2_c.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_c.c-C-T1--goto-backend.in b/test/rlhc.d/case/erract2_c.c-C-T1--goto-backend.in
index ca1c7775..ca1c7775 100644
--- a/test/cases/rlhc.d/case/erract2_c.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/erract2_c.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_c.c-C-T1--var-backend.exp b/test/rlhc.d/case/erract2_c.c-C-T1--var-backend.exp
index 7a14c273..7a14c273 100644
--- a/test/cases/rlhc.d/case/erract2_c.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/erract2_c.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_c.c-C-T1--var-backend.in b/test/rlhc.d/case/erract2_c.c-C-T1--var-backend.in
index 0794c6cf..0794c6cf 100644
--- a/test/cases/rlhc.d/case/erract2_c.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/erract2_c.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_crack.crk-K-F0--var-backend.exp b/test/rlhc.d/case/erract2_crack.crk-K-F0--var-backend.exp
index 3d7b9eb4..3d7b9eb4 100644
--- a/test/cases/rlhc.d/case/erract2_crack.crk-K-F0--var-backend.exp
+++ b/test/rlhc.d/case/erract2_crack.crk-K-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_crack.crk-K-F0--var-backend.in b/test/rlhc.d/case/erract2_crack.crk-K-F0--var-backend.in
index 45f84b84..45f84b84 100644
--- a/test/cases/rlhc.d/case/erract2_crack.crk-K-F0--var-backend.in
+++ b/test/rlhc.d/case/erract2_crack.crk-K-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_crack.crk-K-F1--var-backend.exp b/test/rlhc.d/case/erract2_crack.crk-K-F1--var-backend.exp
index 22842a40..22842a40 100644
--- a/test/cases/rlhc.d/case/erract2_crack.crk-K-F1--var-backend.exp
+++ b/test/rlhc.d/case/erract2_crack.crk-K-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_crack.crk-K-F1--var-backend.in b/test/rlhc.d/case/erract2_crack.crk-K-F1--var-backend.in
index 7cc10773..7cc10773 100644
--- a/test/cases/rlhc.d/case/erract2_crack.crk-K-F1--var-backend.in
+++ b/test/rlhc.d/case/erract2_crack.crk-K-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_crack.crk-K-T0--var-backend.exp b/test/rlhc.d/case/erract2_crack.crk-K-T0--var-backend.exp
index d8698435..d8698435 100644
--- a/test/cases/rlhc.d/case/erract2_crack.crk-K-T0--var-backend.exp
+++ b/test/rlhc.d/case/erract2_crack.crk-K-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_crack.crk-K-T0--var-backend.in b/test/rlhc.d/case/erract2_crack.crk-K-T0--var-backend.in
index 178ddf89..178ddf89 100644
--- a/test/cases/rlhc.d/case/erract2_crack.crk-K-T0--var-backend.in
+++ b/test/rlhc.d/case/erract2_crack.crk-K-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_crack.crk-K-T1--var-backend.exp b/test/rlhc.d/case/erract2_crack.crk-K-T1--var-backend.exp
index 7cf17ecb..7cf17ecb 100644
--- a/test/cases/rlhc.d/case/erract2_crack.crk-K-T1--var-backend.exp
+++ b/test/rlhc.d/case/erract2_crack.crk-K-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_crack.crk-K-T1--var-backend.in b/test/rlhc.d/case/erract2_crack.crk-K-T1--var-backend.in
index 426d425a..426d425a 100644
--- a/test/cases/rlhc.d/case/erract2_crack.crk-K-T1--var-backend.in
+++ b/test/rlhc.d/case/erract2_crack.crk-K-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_cs.cs-A-F0--goto-backend.exp b/test/rlhc.d/case/erract2_cs.cs-A-F0--goto-backend.exp
index 2b1b0885..2b1b0885 100644
--- a/test/cases/rlhc.d/case/erract2_cs.cs-A-F0--goto-backend.exp
+++ b/test/rlhc.d/case/erract2_cs.cs-A-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_cs.cs-A-F0--goto-backend.in b/test/rlhc.d/case/erract2_cs.cs-A-F0--goto-backend.in
index 7b3a45e5..7b3a45e5 100644
--- a/test/cases/rlhc.d/case/erract2_cs.cs-A-F0--goto-backend.in
+++ b/test/rlhc.d/case/erract2_cs.cs-A-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_cs.cs-A-F0--var-backend.exp b/test/rlhc.d/case/erract2_cs.cs-A-F0--var-backend.exp
index d77196ca..d77196ca 100644
--- a/test/cases/rlhc.d/case/erract2_cs.cs-A-F0--var-backend.exp
+++ b/test/rlhc.d/case/erract2_cs.cs-A-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_cs.cs-A-F0--var-backend.in b/test/rlhc.d/case/erract2_cs.cs-A-F0--var-backend.in
index b5c13af7..b5c13af7 100644
--- a/test/cases/rlhc.d/case/erract2_cs.cs-A-F0--var-backend.in
+++ b/test/rlhc.d/case/erract2_cs.cs-A-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_cs.cs-A-F1--goto-backend.exp b/test/rlhc.d/case/erract2_cs.cs-A-F1--goto-backend.exp
index 13696769..13696769 100644
--- a/test/cases/rlhc.d/case/erract2_cs.cs-A-F1--goto-backend.exp
+++ b/test/rlhc.d/case/erract2_cs.cs-A-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_cs.cs-A-F1--goto-backend.in b/test/rlhc.d/case/erract2_cs.cs-A-F1--goto-backend.in
index 2a53d192..2a53d192 100644
--- a/test/cases/rlhc.d/case/erract2_cs.cs-A-F1--goto-backend.in
+++ b/test/rlhc.d/case/erract2_cs.cs-A-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_cs.cs-A-F1--var-backend.exp b/test/rlhc.d/case/erract2_cs.cs-A-F1--var-backend.exp
index d908a0fc..d908a0fc 100644
--- a/test/cases/rlhc.d/case/erract2_cs.cs-A-F1--var-backend.exp
+++ b/test/rlhc.d/case/erract2_cs.cs-A-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_cs.cs-A-F1--var-backend.in b/test/rlhc.d/case/erract2_cs.cs-A-F1--var-backend.in
index 8be914f9..8be914f9 100644
--- a/test/cases/rlhc.d/case/erract2_cs.cs-A-F1--var-backend.in
+++ b/test/rlhc.d/case/erract2_cs.cs-A-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_cs.cs-A-G0--goto-backend.exp b/test/rlhc.d/case/erract2_cs.cs-A-G0--goto-backend.exp
index b64a544e..b64a544e 100644
--- a/test/cases/rlhc.d/case/erract2_cs.cs-A-G0--goto-backend.exp
+++ b/test/rlhc.d/case/erract2_cs.cs-A-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_cs.cs-A-G0--goto-backend.in b/test/rlhc.d/case/erract2_cs.cs-A-G0--goto-backend.in
index 98615642..98615642 100644
--- a/test/cases/rlhc.d/case/erract2_cs.cs-A-G0--goto-backend.in
+++ b/test/rlhc.d/case/erract2_cs.cs-A-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_cs.cs-A-G1--goto-backend.exp b/test/rlhc.d/case/erract2_cs.cs-A-G1--goto-backend.exp
index abd524b4..abd524b4 100644
--- a/test/cases/rlhc.d/case/erract2_cs.cs-A-G1--goto-backend.exp
+++ b/test/rlhc.d/case/erract2_cs.cs-A-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_cs.cs-A-G1--goto-backend.in b/test/rlhc.d/case/erract2_cs.cs-A-G1--goto-backend.in
index 8530115a..8530115a 100644
--- a/test/cases/rlhc.d/case/erract2_cs.cs-A-G1--goto-backend.in
+++ b/test/rlhc.d/case/erract2_cs.cs-A-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_cs.cs-A-T0--goto-backend.exp b/test/rlhc.d/case/erract2_cs.cs-A-T0--goto-backend.exp
index 717a2c9d..717a2c9d 100644
--- a/test/cases/rlhc.d/case/erract2_cs.cs-A-T0--goto-backend.exp
+++ b/test/rlhc.d/case/erract2_cs.cs-A-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_cs.cs-A-T0--goto-backend.in b/test/rlhc.d/case/erract2_cs.cs-A-T0--goto-backend.in
index 76ea3f20..76ea3f20 100644
--- a/test/cases/rlhc.d/case/erract2_cs.cs-A-T0--goto-backend.in
+++ b/test/rlhc.d/case/erract2_cs.cs-A-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_cs.cs-A-T0--var-backend.exp b/test/rlhc.d/case/erract2_cs.cs-A-T0--var-backend.exp
index e2cb3c51..e2cb3c51 100644
--- a/test/cases/rlhc.d/case/erract2_cs.cs-A-T0--var-backend.exp
+++ b/test/rlhc.d/case/erract2_cs.cs-A-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_cs.cs-A-T0--var-backend.in b/test/rlhc.d/case/erract2_cs.cs-A-T0--var-backend.in
index 72f37611..72f37611 100644
--- a/test/cases/rlhc.d/case/erract2_cs.cs-A-T0--var-backend.in
+++ b/test/rlhc.d/case/erract2_cs.cs-A-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_cs.cs-A-T1--goto-backend.exp b/test/rlhc.d/case/erract2_cs.cs-A-T1--goto-backend.exp
index a9286258..a9286258 100644
--- a/test/cases/rlhc.d/case/erract2_cs.cs-A-T1--goto-backend.exp
+++ b/test/rlhc.d/case/erract2_cs.cs-A-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_cs.cs-A-T1--goto-backend.in b/test/rlhc.d/case/erract2_cs.cs-A-T1--goto-backend.in
index ae2ec3c6..ae2ec3c6 100644
--- a/test/cases/rlhc.d/case/erract2_cs.cs-A-T1--goto-backend.in
+++ b/test/rlhc.d/case/erract2_cs.cs-A-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_cs.cs-A-T1--var-backend.exp b/test/rlhc.d/case/erract2_cs.cs-A-T1--var-backend.exp
index bf30df24..bf30df24 100644
--- a/test/cases/rlhc.d/case/erract2_cs.cs-A-T1--var-backend.exp
+++ b/test/rlhc.d/case/erract2_cs.cs-A-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_cs.cs-A-T1--var-backend.in b/test/rlhc.d/case/erract2_cs.cs-A-T1--var-backend.in
index e873d0cb..e873d0cb 100644
--- a/test/cases/rlhc.d/case/erract2_cs.cs-A-T1--var-backend.in
+++ b/test/rlhc.d/case/erract2_cs.cs-A-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_go.go-Z-F0--goto-backend.exp b/test/rlhc.d/case/erract2_go.go-Z-F0--goto-backend.exp
index 65a02b4c..65a02b4c 100644
--- a/test/cases/rlhc.d/case/erract2_go.go-Z-F0--goto-backend.exp
+++ b/test/rlhc.d/case/erract2_go.go-Z-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_go.go-Z-F0--goto-backend.in b/test/rlhc.d/case/erract2_go.go-Z-F0--goto-backend.in
index cdb3ef2a..cdb3ef2a 100644
--- a/test/cases/rlhc.d/case/erract2_go.go-Z-F0--goto-backend.in
+++ b/test/rlhc.d/case/erract2_go.go-Z-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_go.go-Z-F0--var-backend.exp b/test/rlhc.d/case/erract2_go.go-Z-F0--var-backend.exp
index da88db4f..da88db4f 100644
--- a/test/cases/rlhc.d/case/erract2_go.go-Z-F0--var-backend.exp
+++ b/test/rlhc.d/case/erract2_go.go-Z-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_go.go-Z-F0--var-backend.in b/test/rlhc.d/case/erract2_go.go-Z-F0--var-backend.in
index bd6359bb..bd6359bb 100644
--- a/test/cases/rlhc.d/case/erract2_go.go-Z-F0--var-backend.in
+++ b/test/rlhc.d/case/erract2_go.go-Z-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_go.go-Z-F1--goto-backend.exp b/test/rlhc.d/case/erract2_go.go-Z-F1--goto-backend.exp
index 5737df14..5737df14 100644
--- a/test/cases/rlhc.d/case/erract2_go.go-Z-F1--goto-backend.exp
+++ b/test/rlhc.d/case/erract2_go.go-Z-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_go.go-Z-F1--goto-backend.in b/test/rlhc.d/case/erract2_go.go-Z-F1--goto-backend.in
index 6e77c18e..6e77c18e 100644
--- a/test/cases/rlhc.d/case/erract2_go.go-Z-F1--goto-backend.in
+++ b/test/rlhc.d/case/erract2_go.go-Z-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_go.go-Z-F1--var-backend.exp b/test/rlhc.d/case/erract2_go.go-Z-F1--var-backend.exp
index a14c74dc..a14c74dc 100644
--- a/test/cases/rlhc.d/case/erract2_go.go-Z-F1--var-backend.exp
+++ b/test/rlhc.d/case/erract2_go.go-Z-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_go.go-Z-F1--var-backend.in b/test/rlhc.d/case/erract2_go.go-Z-F1--var-backend.in
index 6e5dba7b..6e5dba7b 100644
--- a/test/cases/rlhc.d/case/erract2_go.go-Z-F1--var-backend.in
+++ b/test/rlhc.d/case/erract2_go.go-Z-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_go.go-Z-G0--goto-backend.exp b/test/rlhc.d/case/erract2_go.go-Z-G0--goto-backend.exp
index a8aad527..a8aad527 100644
--- a/test/cases/rlhc.d/case/erract2_go.go-Z-G0--goto-backend.exp
+++ b/test/rlhc.d/case/erract2_go.go-Z-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_go.go-Z-G0--goto-backend.in b/test/rlhc.d/case/erract2_go.go-Z-G0--goto-backend.in
index 69ec33ae..69ec33ae 100644
--- a/test/cases/rlhc.d/case/erract2_go.go-Z-G0--goto-backend.in
+++ b/test/rlhc.d/case/erract2_go.go-Z-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_go.go-Z-G1--goto-backend.exp b/test/rlhc.d/case/erract2_go.go-Z-G1--goto-backend.exp
index 5dce23ed..5dce23ed 100644
--- a/test/cases/rlhc.d/case/erract2_go.go-Z-G1--goto-backend.exp
+++ b/test/rlhc.d/case/erract2_go.go-Z-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_go.go-Z-G1--goto-backend.in b/test/rlhc.d/case/erract2_go.go-Z-G1--goto-backend.in
index 1c640e8e..1c640e8e 100644
--- a/test/cases/rlhc.d/case/erract2_go.go-Z-G1--goto-backend.in
+++ b/test/rlhc.d/case/erract2_go.go-Z-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_go.go-Z-G2--goto-backend.exp b/test/rlhc.d/case/erract2_go.go-Z-G2--goto-backend.exp
index 74e6a846..74e6a846 100644
--- a/test/cases/rlhc.d/case/erract2_go.go-Z-G2--goto-backend.exp
+++ b/test/rlhc.d/case/erract2_go.go-Z-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_go.go-Z-G2--goto-backend.in b/test/rlhc.d/case/erract2_go.go-Z-G2--goto-backend.in
index ca3da333..ca3da333 100644
--- a/test/cases/rlhc.d/case/erract2_go.go-Z-G2--goto-backend.in
+++ b/test/rlhc.d/case/erract2_go.go-Z-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_go.go-Z-T0--goto-backend.exp b/test/rlhc.d/case/erract2_go.go-Z-T0--goto-backend.exp
index c165ded4..c165ded4 100644
--- a/test/cases/rlhc.d/case/erract2_go.go-Z-T0--goto-backend.exp
+++ b/test/rlhc.d/case/erract2_go.go-Z-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_go.go-Z-T0--goto-backend.in b/test/rlhc.d/case/erract2_go.go-Z-T0--goto-backend.in
index 104d37e7..104d37e7 100644
--- a/test/cases/rlhc.d/case/erract2_go.go-Z-T0--goto-backend.in
+++ b/test/rlhc.d/case/erract2_go.go-Z-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_go.go-Z-T0--var-backend.exp b/test/rlhc.d/case/erract2_go.go-Z-T0--var-backend.exp
index 8044dd99..8044dd99 100644
--- a/test/cases/rlhc.d/case/erract2_go.go-Z-T0--var-backend.exp
+++ b/test/rlhc.d/case/erract2_go.go-Z-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_go.go-Z-T0--var-backend.in b/test/rlhc.d/case/erract2_go.go-Z-T0--var-backend.in
index 4d3ef9ee..4d3ef9ee 100644
--- a/test/cases/rlhc.d/case/erract2_go.go-Z-T0--var-backend.in
+++ b/test/rlhc.d/case/erract2_go.go-Z-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_go.go-Z-T1--goto-backend.exp b/test/rlhc.d/case/erract2_go.go-Z-T1--goto-backend.exp
index 06d89111..06d89111 100644
--- a/test/cases/rlhc.d/case/erract2_go.go-Z-T1--goto-backend.exp
+++ b/test/rlhc.d/case/erract2_go.go-Z-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_go.go-Z-T1--goto-backend.in b/test/rlhc.d/case/erract2_go.go-Z-T1--goto-backend.in
index 60fc775a..60fc775a 100644
--- a/test/cases/rlhc.d/case/erract2_go.go-Z-T1--goto-backend.in
+++ b/test/rlhc.d/case/erract2_go.go-Z-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_go.go-Z-T1--var-backend.exp b/test/rlhc.d/case/erract2_go.go-Z-T1--var-backend.exp
index 8ae24cad..8ae24cad 100644
--- a/test/cases/rlhc.d/case/erract2_go.go-Z-T1--var-backend.exp
+++ b/test/rlhc.d/case/erract2_go.go-Z-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_go.go-Z-T1--var-backend.in b/test/rlhc.d/case/erract2_go.go-Z-T1--var-backend.in
index 4d6f5451..4d6f5451 100644
--- a/test/cases/rlhc.d/case/erract2_go.go-Z-T1--var-backend.in
+++ b/test/rlhc.d/case/erract2_go.go-Z-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_java.java-J-F0--goto-backend.exp b/test/rlhc.d/case/erract2_java.java-J-F0--goto-backend.exp
index f40e405b..f40e405b 100644
--- a/test/cases/rlhc.d/case/erract2_java.java-J-F0--goto-backend.exp
+++ b/test/rlhc.d/case/erract2_java.java-J-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_java.java-J-F0--goto-backend.in b/test/rlhc.d/case/erract2_java.java-J-F0--goto-backend.in
index e4a260b0..e4a260b0 100644
--- a/test/cases/rlhc.d/case/erract2_java.java-J-F0--goto-backend.in
+++ b/test/rlhc.d/case/erract2_java.java-J-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_java.java-J-F0--var-backend.exp b/test/rlhc.d/case/erract2_java.java-J-F0--var-backend.exp
index ce83b4cd..ce83b4cd 100644
--- a/test/cases/rlhc.d/case/erract2_java.java-J-F0--var-backend.exp
+++ b/test/rlhc.d/case/erract2_java.java-J-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_java.java-J-F0--var-backend.in b/test/rlhc.d/case/erract2_java.java-J-F0--var-backend.in
index cb95a720..cb95a720 100644
--- a/test/cases/rlhc.d/case/erract2_java.java-J-F0--var-backend.in
+++ b/test/rlhc.d/case/erract2_java.java-J-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_java.java-J-F1--goto-backend.exp b/test/rlhc.d/case/erract2_java.java-J-F1--goto-backend.exp
index dfc2c5a2..dfc2c5a2 100644
--- a/test/cases/rlhc.d/case/erract2_java.java-J-F1--goto-backend.exp
+++ b/test/rlhc.d/case/erract2_java.java-J-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_java.java-J-F1--goto-backend.in b/test/rlhc.d/case/erract2_java.java-J-F1--goto-backend.in
index c5764e64..c5764e64 100644
--- a/test/cases/rlhc.d/case/erract2_java.java-J-F1--goto-backend.in
+++ b/test/rlhc.d/case/erract2_java.java-J-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_java.java-J-F1--var-backend.exp b/test/rlhc.d/case/erract2_java.java-J-F1--var-backend.exp
index 51535532..51535532 100644
--- a/test/cases/rlhc.d/case/erract2_java.java-J-F1--var-backend.exp
+++ b/test/rlhc.d/case/erract2_java.java-J-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_java.java-J-F1--var-backend.in b/test/rlhc.d/case/erract2_java.java-J-F1--var-backend.in
index 9f06477b..9f06477b 100644
--- a/test/cases/rlhc.d/case/erract2_java.java-J-F1--var-backend.in
+++ b/test/rlhc.d/case/erract2_java.java-J-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_java.java-J-T0--goto-backend.exp b/test/rlhc.d/case/erract2_java.java-J-T0--goto-backend.exp
index 34700d13..34700d13 100644
--- a/test/cases/rlhc.d/case/erract2_java.java-J-T0--goto-backend.exp
+++ b/test/rlhc.d/case/erract2_java.java-J-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_java.java-J-T0--goto-backend.in b/test/rlhc.d/case/erract2_java.java-J-T0--goto-backend.in
index 275bdcfe..275bdcfe 100644
--- a/test/cases/rlhc.d/case/erract2_java.java-J-T0--goto-backend.in
+++ b/test/rlhc.d/case/erract2_java.java-J-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_java.java-J-T0--var-backend.exp b/test/rlhc.d/case/erract2_java.java-J-T0--var-backend.exp
index babbec5a..babbec5a 100644
--- a/test/cases/rlhc.d/case/erract2_java.java-J-T0--var-backend.exp
+++ b/test/rlhc.d/case/erract2_java.java-J-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_java.java-J-T0--var-backend.in b/test/rlhc.d/case/erract2_java.java-J-T0--var-backend.in
index 9a2513bd..9a2513bd 100644
--- a/test/cases/rlhc.d/case/erract2_java.java-J-T0--var-backend.in
+++ b/test/rlhc.d/case/erract2_java.java-J-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_java.java-J-T1--goto-backend.exp b/test/rlhc.d/case/erract2_java.java-J-T1--goto-backend.exp
index 530d5570..530d5570 100644
--- a/test/cases/rlhc.d/case/erract2_java.java-J-T1--goto-backend.exp
+++ b/test/rlhc.d/case/erract2_java.java-J-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_java.java-J-T1--goto-backend.in b/test/rlhc.d/case/erract2_java.java-J-T1--goto-backend.in
index c0e563ba..c0e563ba 100644
--- a/test/cases/rlhc.d/case/erract2_java.java-J-T1--goto-backend.in
+++ b/test/rlhc.d/case/erract2_java.java-J-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_java.java-J-T1--var-backend.exp b/test/rlhc.d/case/erract2_java.java-J-T1--var-backend.exp
index 818de251..818de251 100644
--- a/test/cases/rlhc.d/case/erract2_java.java-J-T1--var-backend.exp
+++ b/test/rlhc.d/case/erract2_java.java-J-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_java.java-J-T1--var-backend.in b/test/rlhc.d/case/erract2_java.java-J-T1--var-backend.in
index 4bbfcb74..4bbfcb74 100644
--- a/test/cases/rlhc.d/case/erract2_java.java-J-T1--var-backend.in
+++ b/test/rlhc.d/case/erract2_java.java-J-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_julia.jl-Y-F0--var-backend.exp b/test/rlhc.d/case/erract2_julia.jl-Y-F0--var-backend.exp
index fae1d101..fae1d101 100644
--- a/test/cases/rlhc.d/case/erract2_julia.jl-Y-F0--var-backend.exp
+++ b/test/rlhc.d/case/erract2_julia.jl-Y-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_julia.jl-Y-F0--var-backend.in b/test/rlhc.d/case/erract2_julia.jl-Y-F0--var-backend.in
index f18f28a2..f18f28a2 100644
--- a/test/cases/rlhc.d/case/erract2_julia.jl-Y-F0--var-backend.in
+++ b/test/rlhc.d/case/erract2_julia.jl-Y-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_julia.jl-Y-F1--var-backend.exp b/test/rlhc.d/case/erract2_julia.jl-Y-F1--var-backend.exp
index 638bb7ad..638bb7ad 100644
--- a/test/cases/rlhc.d/case/erract2_julia.jl-Y-F1--var-backend.exp
+++ b/test/rlhc.d/case/erract2_julia.jl-Y-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_julia.jl-Y-F1--var-backend.in b/test/rlhc.d/case/erract2_julia.jl-Y-F1--var-backend.in
index 57620067..57620067 100644
--- a/test/cases/rlhc.d/case/erract2_julia.jl-Y-F1--var-backend.in
+++ b/test/rlhc.d/case/erract2_julia.jl-Y-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_julia.jl-Y-T0--var-backend.exp b/test/rlhc.d/case/erract2_julia.jl-Y-T0--var-backend.exp
index b0056d16..b0056d16 100644
--- a/test/cases/rlhc.d/case/erract2_julia.jl-Y-T0--var-backend.exp
+++ b/test/rlhc.d/case/erract2_julia.jl-Y-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_julia.jl-Y-T0--var-backend.in b/test/rlhc.d/case/erract2_julia.jl-Y-T0--var-backend.in
index fe19d524..fe19d524 100644
--- a/test/cases/rlhc.d/case/erract2_julia.jl-Y-T0--var-backend.in
+++ b/test/rlhc.d/case/erract2_julia.jl-Y-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_julia.jl-Y-T1--var-backend.exp b/test/rlhc.d/case/erract2_julia.jl-Y-T1--var-backend.exp
index feaab5ae..feaab5ae 100644
--- a/test/cases/rlhc.d/case/erract2_julia.jl-Y-T1--var-backend.exp
+++ b/test/rlhc.d/case/erract2_julia.jl-Y-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_julia.jl-Y-T1--var-backend.in b/test/rlhc.d/case/erract2_julia.jl-Y-T1--var-backend.in
index 7082865c..7082865c 100644
--- a/test/cases/rlhc.d/case/erract2_julia.jl-Y-T1--var-backend.in
+++ b/test/rlhc.d/case/erract2_julia.jl-Y-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_ocaml.ml-O-F0--var-backend.exp b/test/rlhc.d/case/erract2_ocaml.ml-O-F0--var-backend.exp
index 5e956f0a..5e956f0a 100644
--- a/test/cases/rlhc.d/case/erract2_ocaml.ml-O-F0--var-backend.exp
+++ b/test/rlhc.d/case/erract2_ocaml.ml-O-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_ocaml.ml-O-F0--var-backend.in b/test/rlhc.d/case/erract2_ocaml.ml-O-F0--var-backend.in
index 1df5f527..1df5f527 100644
--- a/test/cases/rlhc.d/case/erract2_ocaml.ml-O-F0--var-backend.in
+++ b/test/rlhc.d/case/erract2_ocaml.ml-O-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_ocaml.ml-O-F1--var-backend.exp b/test/rlhc.d/case/erract2_ocaml.ml-O-F1--var-backend.exp
index 9d9e9a1c..9d9e9a1c 100644
--- a/test/cases/rlhc.d/case/erract2_ocaml.ml-O-F1--var-backend.exp
+++ b/test/rlhc.d/case/erract2_ocaml.ml-O-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_ocaml.ml-O-F1--var-backend.in b/test/rlhc.d/case/erract2_ocaml.ml-O-F1--var-backend.in
index 666de394..666de394 100644
--- a/test/cases/rlhc.d/case/erract2_ocaml.ml-O-F1--var-backend.in
+++ b/test/rlhc.d/case/erract2_ocaml.ml-O-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_ocaml.ml-O-T0--var-backend.exp b/test/rlhc.d/case/erract2_ocaml.ml-O-T0--var-backend.exp
index 86ec2a7a..86ec2a7a 100644
--- a/test/cases/rlhc.d/case/erract2_ocaml.ml-O-T0--var-backend.exp
+++ b/test/rlhc.d/case/erract2_ocaml.ml-O-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_ocaml.ml-O-T0--var-backend.in b/test/rlhc.d/case/erract2_ocaml.ml-O-T0--var-backend.in
index a0d198e0..a0d198e0 100644
--- a/test/cases/rlhc.d/case/erract2_ocaml.ml-O-T0--var-backend.in
+++ b/test/rlhc.d/case/erract2_ocaml.ml-O-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_ocaml.ml-O-T1--var-backend.exp b/test/rlhc.d/case/erract2_ocaml.ml-O-T1--var-backend.exp
index afe225f7..afe225f7 100644
--- a/test/cases/rlhc.d/case/erract2_ocaml.ml-O-T1--var-backend.exp
+++ b/test/rlhc.d/case/erract2_ocaml.ml-O-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_ocaml.ml-O-T1--var-backend.in b/test/rlhc.d/case/erract2_ocaml.ml-O-T1--var-backend.in
index 8f7f9837..8f7f9837 100644
--- a/test/cases/rlhc.d/case/erract2_ocaml.ml-O-T1--var-backend.in
+++ b/test/rlhc.d/case/erract2_ocaml.ml-O-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_ruby.rb-R-F0--var-backend.exp b/test/rlhc.d/case/erract2_ruby.rb-R-F0--var-backend.exp
index 40f36076..40f36076 100644
--- a/test/cases/rlhc.d/case/erract2_ruby.rb-R-F0--var-backend.exp
+++ b/test/rlhc.d/case/erract2_ruby.rb-R-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_ruby.rb-R-F0--var-backend.in b/test/rlhc.d/case/erract2_ruby.rb-R-F0--var-backend.in
index 8aa898df..8aa898df 100644
--- a/test/cases/rlhc.d/case/erract2_ruby.rb-R-F0--var-backend.in
+++ b/test/rlhc.d/case/erract2_ruby.rb-R-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_ruby.rb-R-F1--var-backend.exp b/test/rlhc.d/case/erract2_ruby.rb-R-F1--var-backend.exp
index 6dc1d733..6dc1d733 100644
--- a/test/cases/rlhc.d/case/erract2_ruby.rb-R-F1--var-backend.exp
+++ b/test/rlhc.d/case/erract2_ruby.rb-R-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_ruby.rb-R-F1--var-backend.in b/test/rlhc.d/case/erract2_ruby.rb-R-F1--var-backend.in
index fbdfbc21..fbdfbc21 100644
--- a/test/cases/rlhc.d/case/erract2_ruby.rb-R-F1--var-backend.in
+++ b/test/rlhc.d/case/erract2_ruby.rb-R-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_ruby.rb-R-T0--var-backend.exp b/test/rlhc.d/case/erract2_ruby.rb-R-T0--var-backend.exp
index fc7d6e15..fc7d6e15 100644
--- a/test/cases/rlhc.d/case/erract2_ruby.rb-R-T0--var-backend.exp
+++ b/test/rlhc.d/case/erract2_ruby.rb-R-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_ruby.rb-R-T0--var-backend.in b/test/rlhc.d/case/erract2_ruby.rb-R-T0--var-backend.in
index 62506340..62506340 100644
--- a/test/cases/rlhc.d/case/erract2_ruby.rb-R-T0--var-backend.in
+++ b/test/rlhc.d/case/erract2_ruby.rb-R-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_ruby.rb-R-T1--var-backend.exp b/test/rlhc.d/case/erract2_ruby.rb-R-T1--var-backend.exp
index e941e9e7..e941e9e7 100644
--- a/test/cases/rlhc.d/case/erract2_ruby.rb-R-T1--var-backend.exp
+++ b/test/rlhc.d/case/erract2_ruby.rb-R-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_ruby.rb-R-T1--var-backend.in b/test/rlhc.d/case/erract2_ruby.rb-R-T1--var-backend.in
index 596eed29..596eed29 100644
--- a/test/cases/rlhc.d/case/erract2_ruby.rb-R-T1--var-backend.in
+++ b/test/rlhc.d/case/erract2_ruby.rb-R-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_rust.rs-U-F0--var-backend.exp b/test/rlhc.d/case/erract2_rust.rs-U-F0--var-backend.exp
index e5582927..e5582927 100644
--- a/test/cases/rlhc.d/case/erract2_rust.rs-U-F0--var-backend.exp
+++ b/test/rlhc.d/case/erract2_rust.rs-U-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_rust.rs-U-F0--var-backend.in b/test/rlhc.d/case/erract2_rust.rs-U-F0--var-backend.in
index e7e3ea13..e7e3ea13 100644
--- a/test/cases/rlhc.d/case/erract2_rust.rs-U-F0--var-backend.in
+++ b/test/rlhc.d/case/erract2_rust.rs-U-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_rust.rs-U-F1--var-backend.exp b/test/rlhc.d/case/erract2_rust.rs-U-F1--var-backend.exp
index 2c767c01..2c767c01 100644
--- a/test/cases/rlhc.d/case/erract2_rust.rs-U-F1--var-backend.exp
+++ b/test/rlhc.d/case/erract2_rust.rs-U-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_rust.rs-U-F1--var-backend.in b/test/rlhc.d/case/erract2_rust.rs-U-F1--var-backend.in
index d562c85d..d562c85d 100644
--- a/test/cases/rlhc.d/case/erract2_rust.rs-U-F1--var-backend.in
+++ b/test/rlhc.d/case/erract2_rust.rs-U-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_rust.rs-U-T0--var-backend.exp b/test/rlhc.d/case/erract2_rust.rs-U-T0--var-backend.exp
index 85f6fcf1..85f6fcf1 100644
--- a/test/cases/rlhc.d/case/erract2_rust.rs-U-T0--var-backend.exp
+++ b/test/rlhc.d/case/erract2_rust.rs-U-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_rust.rs-U-T0--var-backend.in b/test/rlhc.d/case/erract2_rust.rs-U-T0--var-backend.in
index 92e454aa..92e454aa 100644
--- a/test/cases/rlhc.d/case/erract2_rust.rs-U-T0--var-backend.in
+++ b/test/rlhc.d/case/erract2_rust.rs-U-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract2_rust.rs-U-T1--var-backend.exp b/test/rlhc.d/case/erract2_rust.rs-U-T1--var-backend.exp
index e9a2023a..e9a2023a 100644
--- a/test/cases/rlhc.d/case/erract2_rust.rs-U-T1--var-backend.exp
+++ b/test/rlhc.d/case/erract2_rust.rs-U-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract2_rust.rs-U-T1--var-backend.in b/test/rlhc.d/case/erract2_rust.rs-U-T1--var-backend.in
index 51c799b1..51c799b1 100644
--- a/test/cases/rlhc.d/case/erract2_rust.rs-U-T1--var-backend.in
+++ b/test/rlhc.d/case/erract2_rust.rs-U-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract3.c-C-F0--goto-backend.exp b/test/rlhc.d/case/erract3.c-C-F0--goto-backend.exp
index b398b7ab..b398b7ab 100644
--- a/test/cases/rlhc.d/case/erract3.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/erract3.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract3.c-C-F0--goto-backend.in b/test/rlhc.d/case/erract3.c-C-F0--goto-backend.in
index dca5321f..dca5321f 100644
--- a/test/cases/rlhc.d/case/erract3.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/erract3.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract3.c-C-F0--var-backend.exp b/test/rlhc.d/case/erract3.c-C-F0--var-backend.exp
index 9ee172cc..9ee172cc 100644
--- a/test/cases/rlhc.d/case/erract3.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/erract3.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract3.c-C-F0--var-backend.in b/test/rlhc.d/case/erract3.c-C-F0--var-backend.in
index 6fd5041b..6fd5041b 100644
--- a/test/cases/rlhc.d/case/erract3.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/erract3.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract3.c-C-F1--goto-backend.exp b/test/rlhc.d/case/erract3.c-C-F1--goto-backend.exp
index b0fd28ca..b0fd28ca 100644
--- a/test/cases/rlhc.d/case/erract3.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/erract3.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract3.c-C-F1--goto-backend.in b/test/rlhc.d/case/erract3.c-C-F1--goto-backend.in
index 8a2c057e..8a2c057e 100644
--- a/test/cases/rlhc.d/case/erract3.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/erract3.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract3.c-C-F1--var-backend.exp b/test/rlhc.d/case/erract3.c-C-F1--var-backend.exp
index 0a19c679..0a19c679 100644
--- a/test/cases/rlhc.d/case/erract3.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/erract3.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract3.c-C-F1--var-backend.in b/test/rlhc.d/case/erract3.c-C-F1--var-backend.in
index 7f2f5b37..7f2f5b37 100644
--- a/test/cases/rlhc.d/case/erract3.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/erract3.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract3.c-C-G0--goto-backend.exp b/test/rlhc.d/case/erract3.c-C-G0--goto-backend.exp
index 6a621239..6a621239 100644
--- a/test/cases/rlhc.d/case/erract3.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/erract3.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract3.c-C-G0--goto-backend.in b/test/rlhc.d/case/erract3.c-C-G0--goto-backend.in
index 578f2002..578f2002 100644
--- a/test/cases/rlhc.d/case/erract3.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/erract3.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract3.c-C-G1--goto-backend.exp b/test/rlhc.d/case/erract3.c-C-G1--goto-backend.exp
index 2312b4ac..2312b4ac 100644
--- a/test/cases/rlhc.d/case/erract3.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/erract3.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract3.c-C-G1--goto-backend.in b/test/rlhc.d/case/erract3.c-C-G1--goto-backend.in
index 88b3eb59..88b3eb59 100644
--- a/test/cases/rlhc.d/case/erract3.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/erract3.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract3.c-C-G2--goto-backend.exp b/test/rlhc.d/case/erract3.c-C-G2--goto-backend.exp
index 4645a4af..4645a4af 100644
--- a/test/cases/rlhc.d/case/erract3.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/erract3.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract3.c-C-G2--goto-backend.in b/test/rlhc.d/case/erract3.c-C-G2--goto-backend.in
index 5c208f44..5c208f44 100644
--- a/test/cases/rlhc.d/case/erract3.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/erract3.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract3.c-C-T0--goto-backend.exp b/test/rlhc.d/case/erract3.c-C-T0--goto-backend.exp
index 5fb579b3..5fb579b3 100644
--- a/test/cases/rlhc.d/case/erract3.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/erract3.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract3.c-C-T0--goto-backend.in b/test/rlhc.d/case/erract3.c-C-T0--goto-backend.in
index e4b600f5..e4b600f5 100644
--- a/test/cases/rlhc.d/case/erract3.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/erract3.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract3.c-C-T0--var-backend.exp b/test/rlhc.d/case/erract3.c-C-T0--var-backend.exp
index a89cbc80..a89cbc80 100644
--- a/test/cases/rlhc.d/case/erract3.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/erract3.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract3.c-C-T0--var-backend.in b/test/rlhc.d/case/erract3.c-C-T0--var-backend.in
index 7c40a9e8..7c40a9e8 100644
--- a/test/cases/rlhc.d/case/erract3.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/erract3.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract3.c-C-T1--goto-backend.exp b/test/rlhc.d/case/erract3.c-C-T1--goto-backend.exp
index 7ba3936f..7ba3936f 100644
--- a/test/cases/rlhc.d/case/erract3.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/erract3.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract3.c-C-T1--goto-backend.in b/test/rlhc.d/case/erract3.c-C-T1--goto-backend.in
index 44845094..44845094 100644
--- a/test/cases/rlhc.d/case/erract3.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/erract3.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract3.c-C-T1--var-backend.exp b/test/rlhc.d/case/erract3.c-C-T1--var-backend.exp
index 62074728..62074728 100644
--- a/test/cases/rlhc.d/case/erract3.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/erract3.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract3.c-C-T1--var-backend.in b/test/rlhc.d/case/erract3.c-C-T1--var-backend.in
index 2a76160c..2a76160c 100644
--- a/test/cases/rlhc.d/case/erract3.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/erract3.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract4.m-C-F0--goto-backend.exp b/test/rlhc.d/case/erract4.m-C-F0--goto-backend.exp
index b87d07ff..b87d07ff 100644
--- a/test/cases/rlhc.d/case/erract4.m-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/erract4.m-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract4.m-C-F0--goto-backend.in b/test/rlhc.d/case/erract4.m-C-F0--goto-backend.in
index 939aa5ff..939aa5ff 100644
--- a/test/cases/rlhc.d/case/erract4.m-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/erract4.m-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract4.m-C-F0--var-backend.exp b/test/rlhc.d/case/erract4.m-C-F0--var-backend.exp
index 998a60b2..998a60b2 100644
--- a/test/cases/rlhc.d/case/erract4.m-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/erract4.m-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract4.m-C-F0--var-backend.in b/test/rlhc.d/case/erract4.m-C-F0--var-backend.in
index 5700cfdc..5700cfdc 100644
--- a/test/cases/rlhc.d/case/erract4.m-C-F0--var-backend.in
+++ b/test/rlhc.d/case/erract4.m-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract4.m-C-F1--goto-backend.exp b/test/rlhc.d/case/erract4.m-C-F1--goto-backend.exp
index ae87d424..ae87d424 100644
--- a/test/cases/rlhc.d/case/erract4.m-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/erract4.m-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract4.m-C-F1--goto-backend.in b/test/rlhc.d/case/erract4.m-C-F1--goto-backend.in
index b1517ac0..b1517ac0 100644
--- a/test/cases/rlhc.d/case/erract4.m-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/erract4.m-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract4.m-C-F1--var-backend.exp b/test/rlhc.d/case/erract4.m-C-F1--var-backend.exp
index 1d988e39..1d988e39 100644
--- a/test/cases/rlhc.d/case/erract4.m-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/erract4.m-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract4.m-C-F1--var-backend.in b/test/rlhc.d/case/erract4.m-C-F1--var-backend.in
index 94626c46..94626c46 100644
--- a/test/cases/rlhc.d/case/erract4.m-C-F1--var-backend.in
+++ b/test/rlhc.d/case/erract4.m-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract4.m-C-G0--goto-backend.exp b/test/rlhc.d/case/erract4.m-C-G0--goto-backend.exp
index ba3d20fe..ba3d20fe 100644
--- a/test/cases/rlhc.d/case/erract4.m-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/erract4.m-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract4.m-C-G0--goto-backend.in b/test/rlhc.d/case/erract4.m-C-G0--goto-backend.in
index 0f120ed0..0f120ed0 100644
--- a/test/cases/rlhc.d/case/erract4.m-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/erract4.m-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract4.m-C-G1--goto-backend.exp b/test/rlhc.d/case/erract4.m-C-G1--goto-backend.exp
index ddf6e2ac..ddf6e2ac 100644
--- a/test/cases/rlhc.d/case/erract4.m-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/erract4.m-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract4.m-C-G1--goto-backend.in b/test/rlhc.d/case/erract4.m-C-G1--goto-backend.in
index ef4b6877..ef4b6877 100644
--- a/test/cases/rlhc.d/case/erract4.m-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/erract4.m-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract4.m-C-G2--goto-backend.exp b/test/rlhc.d/case/erract4.m-C-G2--goto-backend.exp
index 8c722fd0..8c722fd0 100644
--- a/test/cases/rlhc.d/case/erract4.m-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/erract4.m-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract4.m-C-G2--goto-backend.in b/test/rlhc.d/case/erract4.m-C-G2--goto-backend.in
index d84124e0..d84124e0 100644
--- a/test/cases/rlhc.d/case/erract4.m-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/erract4.m-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract4.m-C-T0--goto-backend.exp b/test/rlhc.d/case/erract4.m-C-T0--goto-backend.exp
index 331926a8..331926a8 100644
--- a/test/cases/rlhc.d/case/erract4.m-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/erract4.m-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract4.m-C-T0--goto-backend.in b/test/rlhc.d/case/erract4.m-C-T0--goto-backend.in
index 547bde58..547bde58 100644
--- a/test/cases/rlhc.d/case/erract4.m-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/erract4.m-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract4.m-C-T0--var-backend.exp b/test/rlhc.d/case/erract4.m-C-T0--var-backend.exp
index 1112de10..1112de10 100644
--- a/test/cases/rlhc.d/case/erract4.m-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/erract4.m-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract4.m-C-T0--var-backend.in b/test/rlhc.d/case/erract4.m-C-T0--var-backend.in
index bbbfd65c..bbbfd65c 100644
--- a/test/cases/rlhc.d/case/erract4.m-C-T0--var-backend.in
+++ b/test/rlhc.d/case/erract4.m-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract4.m-C-T1--goto-backend.exp b/test/rlhc.d/case/erract4.m-C-T1--goto-backend.exp
index 579a1659..579a1659 100644
--- a/test/cases/rlhc.d/case/erract4.m-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/erract4.m-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract4.m-C-T1--goto-backend.in b/test/rlhc.d/case/erract4.m-C-T1--goto-backend.in
index bb52b9f0..bb52b9f0 100644
--- a/test/cases/rlhc.d/case/erract4.m-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/erract4.m-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract4.m-C-T1--var-backend.exp b/test/rlhc.d/case/erract4.m-C-T1--var-backend.exp
index de661266..de661266 100644
--- a/test/cases/rlhc.d/case/erract4.m-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/erract4.m-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract4.m-C-T1--var-backend.in b/test/rlhc.d/case/erract4.m-C-T1--var-backend.in
index d0abe2b5..d0abe2b5 100644
--- a/test/cases/rlhc.d/case/erract4.m-C-T1--var-backend.in
+++ b/test/rlhc.d/case/erract4.m-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract5.m-C-F0--goto-backend.exp b/test/rlhc.d/case/erract5.m-C-F0--goto-backend.exp
index a764cda5..a764cda5 100644
--- a/test/cases/rlhc.d/case/erract5.m-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/erract5.m-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract5.m-C-F0--goto-backend.in b/test/rlhc.d/case/erract5.m-C-F0--goto-backend.in
index 93b1a687..93b1a687 100644
--- a/test/cases/rlhc.d/case/erract5.m-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/erract5.m-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract5.m-C-F0--var-backend.exp b/test/rlhc.d/case/erract5.m-C-F0--var-backend.exp
index 81beb67e..81beb67e 100644
--- a/test/cases/rlhc.d/case/erract5.m-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/erract5.m-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract5.m-C-F0--var-backend.in b/test/rlhc.d/case/erract5.m-C-F0--var-backend.in
index 9807585b..9807585b 100644
--- a/test/cases/rlhc.d/case/erract5.m-C-F0--var-backend.in
+++ b/test/rlhc.d/case/erract5.m-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract5.m-C-F1--goto-backend.exp b/test/rlhc.d/case/erract5.m-C-F1--goto-backend.exp
index d1863442..d1863442 100644
--- a/test/cases/rlhc.d/case/erract5.m-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/erract5.m-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract5.m-C-F1--goto-backend.in b/test/rlhc.d/case/erract5.m-C-F1--goto-backend.in
index 5177aaff..5177aaff 100644
--- a/test/cases/rlhc.d/case/erract5.m-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/erract5.m-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract5.m-C-F1--var-backend.exp b/test/rlhc.d/case/erract5.m-C-F1--var-backend.exp
index f68adce1..f68adce1 100644
--- a/test/cases/rlhc.d/case/erract5.m-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/erract5.m-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract5.m-C-F1--var-backend.in b/test/rlhc.d/case/erract5.m-C-F1--var-backend.in
index 84c162c5..84c162c5 100644
--- a/test/cases/rlhc.d/case/erract5.m-C-F1--var-backend.in
+++ b/test/rlhc.d/case/erract5.m-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract5.m-C-G0--goto-backend.exp b/test/rlhc.d/case/erract5.m-C-G0--goto-backend.exp
index 4126d7cf..4126d7cf 100644
--- a/test/cases/rlhc.d/case/erract5.m-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/erract5.m-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract5.m-C-G0--goto-backend.in b/test/rlhc.d/case/erract5.m-C-G0--goto-backend.in
index 2554f7e7..2554f7e7 100644
--- a/test/cases/rlhc.d/case/erract5.m-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/erract5.m-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract5.m-C-G1--goto-backend.exp b/test/rlhc.d/case/erract5.m-C-G1--goto-backend.exp
index e86b057b..e86b057b 100644
--- a/test/cases/rlhc.d/case/erract5.m-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/erract5.m-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract5.m-C-G1--goto-backend.in b/test/rlhc.d/case/erract5.m-C-G1--goto-backend.in
index a3cd5693..a3cd5693 100644
--- a/test/cases/rlhc.d/case/erract5.m-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/erract5.m-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract5.m-C-G2--goto-backend.exp b/test/rlhc.d/case/erract5.m-C-G2--goto-backend.exp
index 7ff21870..7ff21870 100644
--- a/test/cases/rlhc.d/case/erract5.m-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/erract5.m-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract5.m-C-G2--goto-backend.in b/test/rlhc.d/case/erract5.m-C-G2--goto-backend.in
index f03753e2..f03753e2 100644
--- a/test/cases/rlhc.d/case/erract5.m-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/erract5.m-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract5.m-C-T0--goto-backend.exp b/test/rlhc.d/case/erract5.m-C-T0--goto-backend.exp
index c2b0cd1b..c2b0cd1b 100644
--- a/test/cases/rlhc.d/case/erract5.m-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/erract5.m-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract5.m-C-T0--goto-backend.in b/test/rlhc.d/case/erract5.m-C-T0--goto-backend.in
index e0e604fb..e0e604fb 100644
--- a/test/cases/rlhc.d/case/erract5.m-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/erract5.m-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract5.m-C-T0--var-backend.exp b/test/rlhc.d/case/erract5.m-C-T0--var-backend.exp
index 9aaadd88..9aaadd88 100644
--- a/test/cases/rlhc.d/case/erract5.m-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/erract5.m-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract5.m-C-T0--var-backend.in b/test/rlhc.d/case/erract5.m-C-T0--var-backend.in
index 2401bdff..2401bdff 100644
--- a/test/cases/rlhc.d/case/erract5.m-C-T0--var-backend.in
+++ b/test/rlhc.d/case/erract5.m-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract5.m-C-T1--goto-backend.exp b/test/rlhc.d/case/erract5.m-C-T1--goto-backend.exp
index d1e6b9f9..d1e6b9f9 100644
--- a/test/cases/rlhc.d/case/erract5.m-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/erract5.m-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract5.m-C-T1--goto-backend.in b/test/rlhc.d/case/erract5.m-C-T1--goto-backend.in
index a4f715cb..a4f715cb 100644
--- a/test/cases/rlhc.d/case/erract5.m-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/erract5.m-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract5.m-C-T1--var-backend.exp b/test/rlhc.d/case/erract5.m-C-T1--var-backend.exp
index 5c2a29e4..5c2a29e4 100644
--- a/test/cases/rlhc.d/case/erract5.m-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/erract5.m-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract5.m-C-T1--var-backend.in b/test/rlhc.d/case/erract5.m-C-T1--var-backend.in
index cce28ac8..cce28ac8 100644
--- a/test/cases/rlhc.d/case/erract5.m-C-T1--var-backend.in
+++ b/test/rlhc.d/case/erract5.m-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract6.c-C-F0--goto-backend.exp b/test/rlhc.d/case/erract6.c-C-F0--goto-backend.exp
index a1e45abd..a1e45abd 100644
--- a/test/cases/rlhc.d/case/erract6.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/erract6.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract6.c-C-F0--goto-backend.in b/test/rlhc.d/case/erract6.c-C-F0--goto-backend.in
index c71c2af3..c71c2af3 100644
--- a/test/cases/rlhc.d/case/erract6.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/erract6.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract6.c-C-F0--var-backend.exp b/test/rlhc.d/case/erract6.c-C-F0--var-backend.exp
index 14f13233..14f13233 100644
--- a/test/cases/rlhc.d/case/erract6.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/erract6.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract6.c-C-F0--var-backend.in b/test/rlhc.d/case/erract6.c-C-F0--var-backend.in
index ecc24a33..ecc24a33 100644
--- a/test/cases/rlhc.d/case/erract6.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/erract6.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract6.c-C-F1--goto-backend.exp b/test/rlhc.d/case/erract6.c-C-F1--goto-backend.exp
index 463b206c..463b206c 100644
--- a/test/cases/rlhc.d/case/erract6.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/erract6.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract6.c-C-F1--goto-backend.in b/test/rlhc.d/case/erract6.c-C-F1--goto-backend.in
index 029295df..029295df 100644
--- a/test/cases/rlhc.d/case/erract6.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/erract6.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract6.c-C-F1--var-backend.exp b/test/rlhc.d/case/erract6.c-C-F1--var-backend.exp
index 14f13233..14f13233 100644
--- a/test/cases/rlhc.d/case/erract6.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/erract6.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract6.c-C-F1--var-backend.in b/test/rlhc.d/case/erract6.c-C-F1--var-backend.in
index ecc24a33..ecc24a33 100644
--- a/test/cases/rlhc.d/case/erract6.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/erract6.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract6.c-C-G0--goto-backend.exp b/test/rlhc.d/case/erract6.c-C-G0--goto-backend.exp
index 40955dd0..40955dd0 100644
--- a/test/cases/rlhc.d/case/erract6.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/erract6.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract6.c-C-G0--goto-backend.in b/test/rlhc.d/case/erract6.c-C-G0--goto-backend.in
index 06a069de..06a069de 100644
--- a/test/cases/rlhc.d/case/erract6.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/erract6.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract6.c-C-G1--goto-backend.exp b/test/rlhc.d/case/erract6.c-C-G1--goto-backend.exp
index ce7f75e5..ce7f75e5 100644
--- a/test/cases/rlhc.d/case/erract6.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/erract6.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract6.c-C-G1--goto-backend.in b/test/rlhc.d/case/erract6.c-C-G1--goto-backend.in
index d1a4a4de..d1a4a4de 100644
--- a/test/cases/rlhc.d/case/erract6.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/erract6.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract6.c-C-G2--goto-backend.exp b/test/rlhc.d/case/erract6.c-C-G2--goto-backend.exp
index 492dbfa0..492dbfa0 100644
--- a/test/cases/rlhc.d/case/erract6.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/erract6.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract6.c-C-G2--goto-backend.in b/test/rlhc.d/case/erract6.c-C-G2--goto-backend.in
index 4fd39d0e..4fd39d0e 100644
--- a/test/cases/rlhc.d/case/erract6.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/erract6.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract6.c-C-T0--goto-backend.exp b/test/rlhc.d/case/erract6.c-C-T0--goto-backend.exp
index c1808b54..c1808b54 100644
--- a/test/cases/rlhc.d/case/erract6.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/erract6.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract6.c-C-T0--goto-backend.in b/test/rlhc.d/case/erract6.c-C-T0--goto-backend.in
index ce82c1c8..ce82c1c8 100644
--- a/test/cases/rlhc.d/case/erract6.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/erract6.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract6.c-C-T0--var-backend.exp b/test/rlhc.d/case/erract6.c-C-T0--var-backend.exp
index 0c393981..0c393981 100644
--- a/test/cases/rlhc.d/case/erract6.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/erract6.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract6.c-C-T0--var-backend.in b/test/rlhc.d/case/erract6.c-C-T0--var-backend.in
index 53cc8849..53cc8849 100644
--- a/test/cases/rlhc.d/case/erract6.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/erract6.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract6.c-C-T1--goto-backend.exp b/test/rlhc.d/case/erract6.c-C-T1--goto-backend.exp
index 5dec90d9..5dec90d9 100644
--- a/test/cases/rlhc.d/case/erract6.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/erract6.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract6.c-C-T1--goto-backend.in b/test/rlhc.d/case/erract6.c-C-T1--goto-backend.in
index 2fe53597..2fe53597 100644
--- a/test/cases/rlhc.d/case/erract6.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/erract6.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract6.c-C-T1--var-backend.exp b/test/rlhc.d/case/erract6.c-C-T1--var-backend.exp
index 175a6533..175a6533 100644
--- a/test/cases/rlhc.d/case/erract6.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/erract6.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract6.c-C-T1--var-backend.in b/test/rlhc.d/case/erract6.c-C-T1--var-backend.in
index f0a6ab65..f0a6ab65 100644
--- a/test/cases/rlhc.d/case/erract6.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/erract6.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract7.c-C-F0--goto-backend.exp b/test/rlhc.d/case/erract7.c-C-F0--goto-backend.exp
index cee8ae1d..cee8ae1d 100644
--- a/test/cases/rlhc.d/case/erract7.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/erract7.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract7.c-C-F0--goto-backend.in b/test/rlhc.d/case/erract7.c-C-F0--goto-backend.in
index 9a3201ad..9a3201ad 100644
--- a/test/cases/rlhc.d/case/erract7.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/erract7.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract7.c-C-F0--var-backend.exp b/test/rlhc.d/case/erract7.c-C-F0--var-backend.exp
index d5579746..d5579746 100644
--- a/test/cases/rlhc.d/case/erract7.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/erract7.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract7.c-C-F0--var-backend.in b/test/rlhc.d/case/erract7.c-C-F0--var-backend.in
index e0a7ddc3..e0a7ddc3 100644
--- a/test/cases/rlhc.d/case/erract7.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/erract7.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract7.c-C-F1--goto-backend.exp b/test/rlhc.d/case/erract7.c-C-F1--goto-backend.exp
index e80c4c8c..e80c4c8c 100644
--- a/test/cases/rlhc.d/case/erract7.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/erract7.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract7.c-C-F1--goto-backend.in b/test/rlhc.d/case/erract7.c-C-F1--goto-backend.in
index 6bc063c7..6bc063c7 100644
--- a/test/cases/rlhc.d/case/erract7.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/erract7.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract7.c-C-F1--var-backend.exp b/test/rlhc.d/case/erract7.c-C-F1--var-backend.exp
index 1bcfd1b3..1bcfd1b3 100644
--- a/test/cases/rlhc.d/case/erract7.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/erract7.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract7.c-C-F1--var-backend.in b/test/rlhc.d/case/erract7.c-C-F1--var-backend.in
index d5461a4c..d5461a4c 100644
--- a/test/cases/rlhc.d/case/erract7.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/erract7.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract7.c-C-G0--goto-backend.exp b/test/rlhc.d/case/erract7.c-C-G0--goto-backend.exp
index d8d9151d..d8d9151d 100644
--- a/test/cases/rlhc.d/case/erract7.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/erract7.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract7.c-C-G0--goto-backend.in b/test/rlhc.d/case/erract7.c-C-G0--goto-backend.in
index 381952ea..381952ea 100644
--- a/test/cases/rlhc.d/case/erract7.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/erract7.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract7.c-C-G1--goto-backend.exp b/test/rlhc.d/case/erract7.c-C-G1--goto-backend.exp
index ec8c3efc..ec8c3efc 100644
--- a/test/cases/rlhc.d/case/erract7.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/erract7.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract7.c-C-G1--goto-backend.in b/test/rlhc.d/case/erract7.c-C-G1--goto-backend.in
index f761c4c4..f761c4c4 100644
--- a/test/cases/rlhc.d/case/erract7.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/erract7.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract7.c-C-G2--goto-backend.exp b/test/rlhc.d/case/erract7.c-C-G2--goto-backend.exp
index 3f545828..3f545828 100644
--- a/test/cases/rlhc.d/case/erract7.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/erract7.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract7.c-C-G2--goto-backend.in b/test/rlhc.d/case/erract7.c-C-G2--goto-backend.in
index de8c0aa9..de8c0aa9 100644
--- a/test/cases/rlhc.d/case/erract7.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/erract7.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract7.c-C-T0--goto-backend.exp b/test/rlhc.d/case/erract7.c-C-T0--goto-backend.exp
index 1fa627a9..1fa627a9 100644
--- a/test/cases/rlhc.d/case/erract7.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/erract7.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract7.c-C-T0--goto-backend.in b/test/rlhc.d/case/erract7.c-C-T0--goto-backend.in
index dd7cfa49..dd7cfa49 100644
--- a/test/cases/rlhc.d/case/erract7.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/erract7.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract7.c-C-T0--var-backend.exp b/test/rlhc.d/case/erract7.c-C-T0--var-backend.exp
index 9617f549..9617f549 100644
--- a/test/cases/rlhc.d/case/erract7.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/erract7.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract7.c-C-T0--var-backend.in b/test/rlhc.d/case/erract7.c-C-T0--var-backend.in
index ae4e4736..ae4e4736 100644
--- a/test/cases/rlhc.d/case/erract7.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/erract7.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract7.c-C-T1--goto-backend.exp b/test/rlhc.d/case/erract7.c-C-T1--goto-backend.exp
index 074df425..074df425 100644
--- a/test/cases/rlhc.d/case/erract7.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/erract7.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract7.c-C-T1--goto-backend.in b/test/rlhc.d/case/erract7.c-C-T1--goto-backend.in
index d937362e..d937362e 100644
--- a/test/cases/rlhc.d/case/erract7.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/erract7.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract7.c-C-T1--var-backend.exp b/test/rlhc.d/case/erract7.c-C-T1--var-backend.exp
index 592751a7..592751a7 100644
--- a/test/cases/rlhc.d/case/erract7.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/erract7.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract7.c-C-T1--var-backend.in b/test/rlhc.d/case/erract7.c-C-T1--var-backend.in
index e5d4e022..e5d4e022 100644
--- a/test/cases/rlhc.d/case/erract7.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/erract7.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract8.java-J-F0--goto-backend.exp b/test/rlhc.d/case/erract8.java-J-F0--goto-backend.exp
index 7667bc7d..7667bc7d 100644
--- a/test/cases/rlhc.d/case/erract8.java-J-F0--goto-backend.exp
+++ b/test/rlhc.d/case/erract8.java-J-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract8.java-J-F0--goto-backend.in b/test/rlhc.d/case/erract8.java-J-F0--goto-backend.in
index 125dd220..125dd220 100644
--- a/test/cases/rlhc.d/case/erract8.java-J-F0--goto-backend.in
+++ b/test/rlhc.d/case/erract8.java-J-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract8.java-J-F0--var-backend.exp b/test/rlhc.d/case/erract8.java-J-F0--var-backend.exp
index a7c867e3..a7c867e3 100644
--- a/test/cases/rlhc.d/case/erract8.java-J-F0--var-backend.exp
+++ b/test/rlhc.d/case/erract8.java-J-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract8.java-J-F0--var-backend.in b/test/rlhc.d/case/erract8.java-J-F0--var-backend.in
index 4b503a25..4b503a25 100644
--- a/test/cases/rlhc.d/case/erract8.java-J-F0--var-backend.in
+++ b/test/rlhc.d/case/erract8.java-J-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract8.java-J-F1--goto-backend.exp b/test/rlhc.d/case/erract8.java-J-F1--goto-backend.exp
index be5f9422..be5f9422 100644
--- a/test/cases/rlhc.d/case/erract8.java-J-F1--goto-backend.exp
+++ b/test/rlhc.d/case/erract8.java-J-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract8.java-J-F1--goto-backend.in b/test/rlhc.d/case/erract8.java-J-F1--goto-backend.in
index 5287c5e2..5287c5e2 100644
--- a/test/cases/rlhc.d/case/erract8.java-J-F1--goto-backend.in
+++ b/test/rlhc.d/case/erract8.java-J-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract8.java-J-F1--var-backend.exp b/test/rlhc.d/case/erract8.java-J-F1--var-backend.exp
index c5187813..c5187813 100644
--- a/test/cases/rlhc.d/case/erract8.java-J-F1--var-backend.exp
+++ b/test/rlhc.d/case/erract8.java-J-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract8.java-J-F1--var-backend.in b/test/rlhc.d/case/erract8.java-J-F1--var-backend.in
index 92420988..92420988 100644
--- a/test/cases/rlhc.d/case/erract8.java-J-F1--var-backend.in
+++ b/test/rlhc.d/case/erract8.java-J-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract8.java-J-T0--goto-backend.exp b/test/rlhc.d/case/erract8.java-J-T0--goto-backend.exp
index 8d3b3ce6..8d3b3ce6 100644
--- a/test/cases/rlhc.d/case/erract8.java-J-T0--goto-backend.exp
+++ b/test/rlhc.d/case/erract8.java-J-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract8.java-J-T0--goto-backend.in b/test/rlhc.d/case/erract8.java-J-T0--goto-backend.in
index fa635d67..fa635d67 100644
--- a/test/cases/rlhc.d/case/erract8.java-J-T0--goto-backend.in
+++ b/test/rlhc.d/case/erract8.java-J-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract8.java-J-T0--var-backend.exp b/test/rlhc.d/case/erract8.java-J-T0--var-backend.exp
index ca5ebfdd..ca5ebfdd 100644
--- a/test/cases/rlhc.d/case/erract8.java-J-T0--var-backend.exp
+++ b/test/rlhc.d/case/erract8.java-J-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract8.java-J-T0--var-backend.in b/test/rlhc.d/case/erract8.java-J-T0--var-backend.in
index 11cf30cb..11cf30cb 100644
--- a/test/cases/rlhc.d/case/erract8.java-J-T0--var-backend.in
+++ b/test/rlhc.d/case/erract8.java-J-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract8.java-J-T1--goto-backend.exp b/test/rlhc.d/case/erract8.java-J-T1--goto-backend.exp
index 88d49ba0..88d49ba0 100644
--- a/test/cases/rlhc.d/case/erract8.java-J-T1--goto-backend.exp
+++ b/test/rlhc.d/case/erract8.java-J-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/erract8.java-J-T1--goto-backend.in b/test/rlhc.d/case/erract8.java-J-T1--goto-backend.in
index 3c5339ff..3c5339ff 100644
--- a/test/cases/rlhc.d/case/erract8.java-J-T1--goto-backend.in
+++ b/test/rlhc.d/case/erract8.java-J-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/erract8.java-J-T1--var-backend.exp b/test/rlhc.d/case/erract8.java-J-T1--var-backend.exp
index fe8479ca..fe8479ca 100644
--- a/test/cases/rlhc.d/case/erract8.java-J-T1--var-backend.exp
+++ b/test/rlhc.d/case/erract8.java-J-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract8.java-J-T1--var-backend.in b/test/rlhc.d/case/erract8.java-J-T1--var-backend.in
index 1862e8ba..1862e8ba 100644
--- a/test/cases/rlhc.d/case/erract8.java-J-T1--var-backend.in
+++ b/test/rlhc.d/case/erract8.java-J-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract9.rb-R-F0--var-backend.exp b/test/rlhc.d/case/erract9.rb-R-F0--var-backend.exp
index 1547d86f..1547d86f 100644
--- a/test/cases/rlhc.d/case/erract9.rb-R-F0--var-backend.exp
+++ b/test/rlhc.d/case/erract9.rb-R-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract9.rb-R-F0--var-backend.in b/test/rlhc.d/case/erract9.rb-R-F0--var-backend.in
index 11dd1831..11dd1831 100644
--- a/test/cases/rlhc.d/case/erract9.rb-R-F0--var-backend.in
+++ b/test/rlhc.d/case/erract9.rb-R-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract9.rb-R-F1--var-backend.exp b/test/rlhc.d/case/erract9.rb-R-F1--var-backend.exp
index c37a6dbd..c37a6dbd 100644
--- a/test/cases/rlhc.d/case/erract9.rb-R-F1--var-backend.exp
+++ b/test/rlhc.d/case/erract9.rb-R-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract9.rb-R-F1--var-backend.in b/test/rlhc.d/case/erract9.rb-R-F1--var-backend.in
index 1440e720..1440e720 100644
--- a/test/cases/rlhc.d/case/erract9.rb-R-F1--var-backend.in
+++ b/test/rlhc.d/case/erract9.rb-R-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract9.rb-R-T0--var-backend.exp b/test/rlhc.d/case/erract9.rb-R-T0--var-backend.exp
index f51fbdd2..f51fbdd2 100644
--- a/test/cases/rlhc.d/case/erract9.rb-R-T0--var-backend.exp
+++ b/test/rlhc.d/case/erract9.rb-R-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract9.rb-R-T0--var-backend.in b/test/rlhc.d/case/erract9.rb-R-T0--var-backend.in
index 27c91f4a..27c91f4a 100644
--- a/test/cases/rlhc.d/case/erract9.rb-R-T0--var-backend.in
+++ b/test/rlhc.d/case/erract9.rb-R-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/erract9.rb-R-T1--var-backend.exp b/test/rlhc.d/case/erract9.rb-R-T1--var-backend.exp
index 0f10f9a5..0f10f9a5 100644
--- a/test/cases/rlhc.d/case/erract9.rb-R-T1--var-backend.exp
+++ b/test/rlhc.d/case/erract9.rb-R-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/erract9.rb-R-T1--var-backend.in b/test/rlhc.d/case/erract9.rb-R-T1--var-backend.in
index d611232d..d611232d 100644
--- a/test/cases/rlhc.d/case/erract9.rb-R-T1--var-backend.in
+++ b/test/rlhc.d/case/erract9.rb-R-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/export1.c-C-F0--goto-backend.exp b/test/rlhc.d/case/export1.c-C-F0--goto-backend.exp
index 306f237c..306f237c 100644
--- a/test/cases/rlhc.d/case/export1.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/export1.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/export1.c-C-F0--goto-backend.in b/test/rlhc.d/case/export1.c-C-F0--goto-backend.in
index c5b7946b..c5b7946b 100644
--- a/test/cases/rlhc.d/case/export1.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/export1.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/export1.c-C-F0--var-backend.exp b/test/rlhc.d/case/export1.c-C-F0--var-backend.exp
index 2c9efb9c..2c9efb9c 100644
--- a/test/cases/rlhc.d/case/export1.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/export1.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/export1.c-C-F0--var-backend.in b/test/rlhc.d/case/export1.c-C-F0--var-backend.in
index 130b07ba..130b07ba 100644
--- a/test/cases/rlhc.d/case/export1.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/export1.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/export1.c-C-F1--goto-backend.exp b/test/rlhc.d/case/export1.c-C-F1--goto-backend.exp
index 14ce4a9d..14ce4a9d 100644
--- a/test/cases/rlhc.d/case/export1.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/export1.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/export1.c-C-F1--goto-backend.in b/test/rlhc.d/case/export1.c-C-F1--goto-backend.in
index 0c38d4b7..0c38d4b7 100644
--- a/test/cases/rlhc.d/case/export1.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/export1.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/export1.c-C-F1--var-backend.exp b/test/rlhc.d/case/export1.c-C-F1--var-backend.exp
index e65eff2e..e65eff2e 100644
--- a/test/cases/rlhc.d/case/export1.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/export1.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/export1.c-C-F1--var-backend.in b/test/rlhc.d/case/export1.c-C-F1--var-backend.in
index c15d7672..c15d7672 100644
--- a/test/cases/rlhc.d/case/export1.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/export1.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/export1.c-C-G0--goto-backend.exp b/test/rlhc.d/case/export1.c-C-G0--goto-backend.exp
index a2f2b3d5..a2f2b3d5 100644
--- a/test/cases/rlhc.d/case/export1.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/export1.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/export1.c-C-G0--goto-backend.in b/test/rlhc.d/case/export1.c-C-G0--goto-backend.in
index 50133be3..50133be3 100644
--- a/test/cases/rlhc.d/case/export1.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/export1.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/export1.c-C-G1--goto-backend.exp b/test/rlhc.d/case/export1.c-C-G1--goto-backend.exp
index 49847c43..49847c43 100644
--- a/test/cases/rlhc.d/case/export1.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/export1.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/export1.c-C-G1--goto-backend.in b/test/rlhc.d/case/export1.c-C-G1--goto-backend.in
index 98211778..98211778 100644
--- a/test/cases/rlhc.d/case/export1.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/export1.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/export1.c-C-G2--goto-backend.exp b/test/rlhc.d/case/export1.c-C-G2--goto-backend.exp
index 5f7d50c2..5f7d50c2 100644
--- a/test/cases/rlhc.d/case/export1.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/export1.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/export1.c-C-G2--goto-backend.in b/test/rlhc.d/case/export1.c-C-G2--goto-backend.in
index 72db68e7..72db68e7 100644
--- a/test/cases/rlhc.d/case/export1.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/export1.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/export1.c-C-T0--goto-backend.exp b/test/rlhc.d/case/export1.c-C-T0--goto-backend.exp
index 95eb91f6..95eb91f6 100644
--- a/test/cases/rlhc.d/case/export1.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/export1.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/export1.c-C-T0--goto-backend.in b/test/rlhc.d/case/export1.c-C-T0--goto-backend.in
index 68ec96c7..68ec96c7 100644
--- a/test/cases/rlhc.d/case/export1.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/export1.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/export1.c-C-T0--var-backend.exp b/test/rlhc.d/case/export1.c-C-T0--var-backend.exp
index 9806937e..9806937e 100644
--- a/test/cases/rlhc.d/case/export1.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/export1.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/export1.c-C-T0--var-backend.in b/test/rlhc.d/case/export1.c-C-T0--var-backend.in
index 8e094ca4..8e094ca4 100644
--- a/test/cases/rlhc.d/case/export1.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/export1.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/export1.c-C-T1--goto-backend.exp b/test/rlhc.d/case/export1.c-C-T1--goto-backend.exp
index 37577823..37577823 100644
--- a/test/cases/rlhc.d/case/export1.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/export1.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/export1.c-C-T1--goto-backend.in b/test/rlhc.d/case/export1.c-C-T1--goto-backend.in
index 44ebef0a..44ebef0a 100644
--- a/test/cases/rlhc.d/case/export1.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/export1.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/export1.c-C-T1--var-backend.exp b/test/rlhc.d/case/export1.c-C-T1--var-backend.exp
index 582bd0f5..582bd0f5 100644
--- a/test/cases/rlhc.d/case/export1.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/export1.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/export1.c-C-T1--var-backend.in b/test/rlhc.d/case/export1.c-C-T1--var-backend.in
index b7768ef7..b7768ef7 100644
--- a/test/cases/rlhc.d/case/export1.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/export1.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/export2.java-J-F0--goto-backend.exp b/test/rlhc.d/case/export2.java-J-F0--goto-backend.exp
index 41eea2a1..41eea2a1 100644
--- a/test/cases/rlhc.d/case/export2.java-J-F0--goto-backend.exp
+++ b/test/rlhc.d/case/export2.java-J-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/export2.java-J-F0--goto-backend.in b/test/rlhc.d/case/export2.java-J-F0--goto-backend.in
index e66a6322..e66a6322 100644
--- a/test/cases/rlhc.d/case/export2.java-J-F0--goto-backend.in
+++ b/test/rlhc.d/case/export2.java-J-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/export2.java-J-F0--var-backend.exp b/test/rlhc.d/case/export2.java-J-F0--var-backend.exp
index 360f3778..360f3778 100644
--- a/test/cases/rlhc.d/case/export2.java-J-F0--var-backend.exp
+++ b/test/rlhc.d/case/export2.java-J-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/export2.java-J-F0--var-backend.in b/test/rlhc.d/case/export2.java-J-F0--var-backend.in
index 2d80e6b7..2d80e6b7 100644
--- a/test/cases/rlhc.d/case/export2.java-J-F0--var-backend.in
+++ b/test/rlhc.d/case/export2.java-J-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/export2.java-J-F1--goto-backend.exp b/test/rlhc.d/case/export2.java-J-F1--goto-backend.exp
index 5c80c961..5c80c961 100644
--- a/test/cases/rlhc.d/case/export2.java-J-F1--goto-backend.exp
+++ b/test/rlhc.d/case/export2.java-J-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/export2.java-J-F1--goto-backend.in b/test/rlhc.d/case/export2.java-J-F1--goto-backend.in
index 4e049fcc..4e049fcc 100644
--- a/test/cases/rlhc.d/case/export2.java-J-F1--goto-backend.in
+++ b/test/rlhc.d/case/export2.java-J-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/export2.java-J-F1--var-backend.exp b/test/rlhc.d/case/export2.java-J-F1--var-backend.exp
index 4bcce63d..4bcce63d 100644
--- a/test/cases/rlhc.d/case/export2.java-J-F1--var-backend.exp
+++ b/test/rlhc.d/case/export2.java-J-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/export2.java-J-F1--var-backend.in b/test/rlhc.d/case/export2.java-J-F1--var-backend.in
index 445636fb..445636fb 100644
--- a/test/cases/rlhc.d/case/export2.java-J-F1--var-backend.in
+++ b/test/rlhc.d/case/export2.java-J-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/export2.java-J-T0--goto-backend.exp b/test/rlhc.d/case/export2.java-J-T0--goto-backend.exp
index 593a1bc7..593a1bc7 100644
--- a/test/cases/rlhc.d/case/export2.java-J-T0--goto-backend.exp
+++ b/test/rlhc.d/case/export2.java-J-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/export2.java-J-T0--goto-backend.in b/test/rlhc.d/case/export2.java-J-T0--goto-backend.in
index 3bcc88a4..3bcc88a4 100644
--- a/test/cases/rlhc.d/case/export2.java-J-T0--goto-backend.in
+++ b/test/rlhc.d/case/export2.java-J-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/export2.java-J-T0--var-backend.exp b/test/rlhc.d/case/export2.java-J-T0--var-backend.exp
index 79b872c4..79b872c4 100644
--- a/test/cases/rlhc.d/case/export2.java-J-T0--var-backend.exp
+++ b/test/rlhc.d/case/export2.java-J-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/export2.java-J-T0--var-backend.in b/test/rlhc.d/case/export2.java-J-T0--var-backend.in
index 1869ab44..1869ab44 100644
--- a/test/cases/rlhc.d/case/export2.java-J-T0--var-backend.in
+++ b/test/rlhc.d/case/export2.java-J-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/export2.java-J-T1--goto-backend.exp b/test/rlhc.d/case/export2.java-J-T1--goto-backend.exp
index 1493a940..1493a940 100644
--- a/test/cases/rlhc.d/case/export2.java-J-T1--goto-backend.exp
+++ b/test/rlhc.d/case/export2.java-J-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/export2.java-J-T1--goto-backend.in b/test/rlhc.d/case/export2.java-J-T1--goto-backend.in
index 1a4b4121..1a4b4121 100644
--- a/test/cases/rlhc.d/case/export2.java-J-T1--goto-backend.in
+++ b/test/rlhc.d/case/export2.java-J-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/export2.java-J-T1--var-backend.exp b/test/rlhc.d/case/export2.java-J-T1--var-backend.exp
index 931cf070..931cf070 100644
--- a/test/cases/rlhc.d/case/export2.java-J-T1--var-backend.exp
+++ b/test/rlhc.d/case/export2.java-J-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/export2.java-J-T1--var-backend.in b/test/rlhc.d/case/export2.java-J-T1--var-backend.in
index cc65b724..cc65b724 100644
--- a/test/cases/rlhc.d/case/export2.java-J-T1--var-backend.in
+++ b/test/rlhc.d/case/export2.java-J-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/export3.rb-R-F0--var-backend.exp b/test/rlhc.d/case/export3.rb-R-F0--var-backend.exp
index 1ccc53e5..1ccc53e5 100644
--- a/test/cases/rlhc.d/case/export3.rb-R-F0--var-backend.exp
+++ b/test/rlhc.d/case/export3.rb-R-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/export3.rb-R-F0--var-backend.in b/test/rlhc.d/case/export3.rb-R-F0--var-backend.in
index 0a2652e1..0a2652e1 100644
--- a/test/cases/rlhc.d/case/export3.rb-R-F0--var-backend.in
+++ b/test/rlhc.d/case/export3.rb-R-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/export3.rb-R-F1--var-backend.exp b/test/rlhc.d/case/export3.rb-R-F1--var-backend.exp
index 977800e5..977800e5 100644
--- a/test/cases/rlhc.d/case/export3.rb-R-F1--var-backend.exp
+++ b/test/rlhc.d/case/export3.rb-R-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/export3.rb-R-F1--var-backend.in b/test/rlhc.d/case/export3.rb-R-F1--var-backend.in
index db686fc1..db686fc1 100644
--- a/test/cases/rlhc.d/case/export3.rb-R-F1--var-backend.in
+++ b/test/rlhc.d/case/export3.rb-R-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/export3.rb-R-T0--var-backend.exp b/test/rlhc.d/case/export3.rb-R-T0--var-backend.exp
index aeb103af..aeb103af 100644
--- a/test/cases/rlhc.d/case/export3.rb-R-T0--var-backend.exp
+++ b/test/rlhc.d/case/export3.rb-R-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/export3.rb-R-T0--var-backend.in b/test/rlhc.d/case/export3.rb-R-T0--var-backend.in
index 9d815eaa..9d815eaa 100644
--- a/test/cases/rlhc.d/case/export3.rb-R-T0--var-backend.in
+++ b/test/rlhc.d/case/export3.rb-R-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/export3.rb-R-T1--var-backend.exp b/test/rlhc.d/case/export3.rb-R-T1--var-backend.exp
index 6fc2d68e..6fc2d68e 100644
--- a/test/cases/rlhc.d/case/export3.rb-R-T1--var-backend.exp
+++ b/test/rlhc.d/case/export3.rb-R-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/export3.rb-R-T1--var-backend.in b/test/rlhc.d/case/export3.rb-R-T1--var-backend.in
index e3233713..e3233713 100644
--- a/test/cases/rlhc.d/case/export3.rb-R-T1--var-backend.in
+++ b/test/rlhc.d/case/export3.rb-R-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/fnext1.c-C-F0--goto-backend.exp b/test/rlhc.d/case/fnext1.c-C-F0--goto-backend.exp
index 9ab60971..9ab60971 100644
--- a/test/cases/rlhc.d/case/fnext1.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/fnext1.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/fnext1.c-C-F0--goto-backend.in b/test/rlhc.d/case/fnext1.c-C-F0--goto-backend.in
index 15e43cc8..15e43cc8 100644
--- a/test/cases/rlhc.d/case/fnext1.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/fnext1.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/fnext1.c-C-F1--goto-backend.exp b/test/rlhc.d/case/fnext1.c-C-F1--goto-backend.exp
index 0c29ba4f..0c29ba4f 100644
--- a/test/cases/rlhc.d/case/fnext1.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/fnext1.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/fnext1.c-C-F1--goto-backend.in b/test/rlhc.d/case/fnext1.c-C-F1--goto-backend.in
index ab817c93..ab817c93 100644
--- a/test/cases/rlhc.d/case/fnext1.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/fnext1.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/fnext1.c-C-G0--goto-backend.exp b/test/rlhc.d/case/fnext1.c-C-G0--goto-backend.exp
index 365e2440..365e2440 100644
--- a/test/cases/rlhc.d/case/fnext1.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/fnext1.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/fnext1.c-C-G0--goto-backend.in b/test/rlhc.d/case/fnext1.c-C-G0--goto-backend.in
index da8f2615..da8f2615 100644
--- a/test/cases/rlhc.d/case/fnext1.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/fnext1.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/fnext1.c-C-G1--goto-backend.exp b/test/rlhc.d/case/fnext1.c-C-G1--goto-backend.exp
index 83341922..83341922 100644
--- a/test/cases/rlhc.d/case/fnext1.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/fnext1.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/fnext1.c-C-G1--goto-backend.in b/test/rlhc.d/case/fnext1.c-C-G1--goto-backend.in
index 3efa027e..3efa027e 100644
--- a/test/cases/rlhc.d/case/fnext1.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/fnext1.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/fnext1.c-C-G2--goto-backend.exp b/test/rlhc.d/case/fnext1.c-C-G2--goto-backend.exp
index db81ec88..db81ec88 100644
--- a/test/cases/rlhc.d/case/fnext1.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/fnext1.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/fnext1.c-C-G2--goto-backend.in b/test/rlhc.d/case/fnext1.c-C-G2--goto-backend.in
index 3cc799da..3cc799da 100644
--- a/test/cases/rlhc.d/case/fnext1.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/fnext1.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/fnext1.c-C-T0--goto-backend.exp b/test/rlhc.d/case/fnext1.c-C-T0--goto-backend.exp
index 89d47e15..89d47e15 100644
--- a/test/cases/rlhc.d/case/fnext1.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/fnext1.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/fnext1.c-C-T0--goto-backend.in b/test/rlhc.d/case/fnext1.c-C-T0--goto-backend.in
index 3243098a..3243098a 100644
--- a/test/cases/rlhc.d/case/fnext1.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/fnext1.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/fnext1.c-C-T1--goto-backend.exp b/test/rlhc.d/case/fnext1.c-C-T1--goto-backend.exp
index bb820a02..bb820a02 100644
--- a/test/cases/rlhc.d/case/fnext1.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/fnext1.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/fnext1.c-C-T1--goto-backend.in b/test/rlhc.d/case/fnext1.c-C-T1--goto-backend.in
index a310acee..a310acee 100644
--- a/test/cases/rlhc.d/case/fnext1.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/fnext1.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/fnext2.c-C-F0--goto-backend.exp b/test/rlhc.d/case/fnext2.c-C-F0--goto-backend.exp
index b13c292d..b13c292d 100644
--- a/test/cases/rlhc.d/case/fnext2.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/fnext2.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/fnext2.c-C-F0--goto-backend.in b/test/rlhc.d/case/fnext2.c-C-F0--goto-backend.in
index 787ba382..787ba382 100644
--- a/test/cases/rlhc.d/case/fnext2.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/fnext2.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/fnext2.c-C-F0--var-backend.exp b/test/rlhc.d/case/fnext2.c-C-F0--var-backend.exp
index e0ab8189..e0ab8189 100644
--- a/test/cases/rlhc.d/case/fnext2.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/fnext2.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/fnext2.c-C-F0--var-backend.in b/test/rlhc.d/case/fnext2.c-C-F0--var-backend.in
index bf03543c..bf03543c 100644
--- a/test/cases/rlhc.d/case/fnext2.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/fnext2.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/fnext2.c-C-F1--goto-backend.exp b/test/rlhc.d/case/fnext2.c-C-F1--goto-backend.exp
index 5f4edc98..5f4edc98 100644
--- a/test/cases/rlhc.d/case/fnext2.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/fnext2.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/fnext2.c-C-F1--goto-backend.in b/test/rlhc.d/case/fnext2.c-C-F1--goto-backend.in
index d17e7fb6..d17e7fb6 100644
--- a/test/cases/rlhc.d/case/fnext2.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/fnext2.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/fnext2.c-C-F1--var-backend.exp b/test/rlhc.d/case/fnext2.c-C-F1--var-backend.exp
index b865503b..b865503b 100644
--- a/test/cases/rlhc.d/case/fnext2.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/fnext2.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/fnext2.c-C-F1--var-backend.in b/test/rlhc.d/case/fnext2.c-C-F1--var-backend.in
index 383d74a6..383d74a6 100644
--- a/test/cases/rlhc.d/case/fnext2.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/fnext2.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/fnext2.c-C-G0--goto-backend.exp b/test/rlhc.d/case/fnext2.c-C-G0--goto-backend.exp
index 0b13df01..0b13df01 100644
--- a/test/cases/rlhc.d/case/fnext2.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/fnext2.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/fnext2.c-C-G0--goto-backend.in b/test/rlhc.d/case/fnext2.c-C-G0--goto-backend.in
index 553f658b..553f658b 100644
--- a/test/cases/rlhc.d/case/fnext2.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/fnext2.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/fnext2.c-C-G1--goto-backend.exp b/test/rlhc.d/case/fnext2.c-C-G1--goto-backend.exp
index 3334dc77..3334dc77 100644
--- a/test/cases/rlhc.d/case/fnext2.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/fnext2.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/fnext2.c-C-G1--goto-backend.in b/test/rlhc.d/case/fnext2.c-C-G1--goto-backend.in
index 0b21144f..0b21144f 100644
--- a/test/cases/rlhc.d/case/fnext2.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/fnext2.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/fnext2.c-C-G2--goto-backend.exp b/test/rlhc.d/case/fnext2.c-C-G2--goto-backend.exp
index 427e7c80..427e7c80 100644
--- a/test/cases/rlhc.d/case/fnext2.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/fnext2.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/fnext2.c-C-G2--goto-backend.in b/test/rlhc.d/case/fnext2.c-C-G2--goto-backend.in
index 5483423b..5483423b 100644
--- a/test/cases/rlhc.d/case/fnext2.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/fnext2.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/fnext2.c-C-T0--goto-backend.exp b/test/rlhc.d/case/fnext2.c-C-T0--goto-backend.exp
index e1e0fd06..e1e0fd06 100644
--- a/test/cases/rlhc.d/case/fnext2.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/fnext2.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/fnext2.c-C-T0--goto-backend.in b/test/rlhc.d/case/fnext2.c-C-T0--goto-backend.in
index 26873792..26873792 100644
--- a/test/cases/rlhc.d/case/fnext2.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/fnext2.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/fnext2.c-C-T0--var-backend.exp b/test/rlhc.d/case/fnext2.c-C-T0--var-backend.exp
index 77ef7359..77ef7359 100644
--- a/test/cases/rlhc.d/case/fnext2.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/fnext2.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/fnext2.c-C-T0--var-backend.in b/test/rlhc.d/case/fnext2.c-C-T0--var-backend.in
index a9a10aa0..a9a10aa0 100644
--- a/test/cases/rlhc.d/case/fnext2.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/fnext2.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/fnext2.c-C-T1--goto-backend.exp b/test/rlhc.d/case/fnext2.c-C-T1--goto-backend.exp
index b011a8c9..b011a8c9 100644
--- a/test/cases/rlhc.d/case/fnext2.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/fnext2.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/fnext2.c-C-T1--goto-backend.in b/test/rlhc.d/case/fnext2.c-C-T1--goto-backend.in
index 740cc238..740cc238 100644
--- a/test/cases/rlhc.d/case/fnext2.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/fnext2.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/fnext2.c-C-T1--var-backend.exp b/test/rlhc.d/case/fnext2.c-C-T1--var-backend.exp
index f8814cdb..f8814cdb 100644
--- a/test/cases/rlhc.d/case/fnext2.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/fnext2.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/fnext2.c-C-T1--var-backend.in b/test/rlhc.d/case/fnext2.c-C-T1--var-backend.in
index f88b41aa..f88b41aa 100644
--- a/test/cases/rlhc.d/case/fnext2.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/fnext2.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/fnext3.c-C-F0--goto-backend.exp b/test/rlhc.d/case/fnext3.c-C-F0--goto-backend.exp
index b13c292d..b13c292d 100644
--- a/test/cases/rlhc.d/case/fnext3.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/fnext3.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/fnext3.c-C-F0--goto-backend.in b/test/rlhc.d/case/fnext3.c-C-F0--goto-backend.in
index 240a8890..240a8890 100644
--- a/test/cases/rlhc.d/case/fnext3.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/fnext3.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/fnext3.c-C-F0--var-backend.exp b/test/rlhc.d/case/fnext3.c-C-F0--var-backend.exp
index e0ab8189..e0ab8189 100644
--- a/test/cases/rlhc.d/case/fnext3.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/fnext3.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/fnext3.c-C-F0--var-backend.in b/test/rlhc.d/case/fnext3.c-C-F0--var-backend.in
index a0dd5db6..a0dd5db6 100644
--- a/test/cases/rlhc.d/case/fnext3.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/fnext3.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/fnext3.c-C-F1--goto-backend.exp b/test/rlhc.d/case/fnext3.c-C-F1--goto-backend.exp
index 5f4edc98..5f4edc98 100644
--- a/test/cases/rlhc.d/case/fnext3.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/fnext3.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/fnext3.c-C-F1--goto-backend.in b/test/rlhc.d/case/fnext3.c-C-F1--goto-backend.in
index 96df3620..96df3620 100644
--- a/test/cases/rlhc.d/case/fnext3.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/fnext3.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/fnext3.c-C-F1--var-backend.exp b/test/rlhc.d/case/fnext3.c-C-F1--var-backend.exp
index b865503b..b865503b 100644
--- a/test/cases/rlhc.d/case/fnext3.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/fnext3.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/fnext3.c-C-F1--var-backend.in b/test/rlhc.d/case/fnext3.c-C-F1--var-backend.in
index dc20a919..dc20a919 100644
--- a/test/cases/rlhc.d/case/fnext3.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/fnext3.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/fnext3.c-C-G0--goto-backend.exp b/test/rlhc.d/case/fnext3.c-C-G0--goto-backend.exp
index 0b13df01..0b13df01 100644
--- a/test/cases/rlhc.d/case/fnext3.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/fnext3.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/fnext3.c-C-G0--goto-backend.in b/test/rlhc.d/case/fnext3.c-C-G0--goto-backend.in
index 4238d025..4238d025 100644
--- a/test/cases/rlhc.d/case/fnext3.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/fnext3.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/fnext3.c-C-G1--goto-backend.exp b/test/rlhc.d/case/fnext3.c-C-G1--goto-backend.exp
index 3334dc77..3334dc77 100644
--- a/test/cases/rlhc.d/case/fnext3.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/fnext3.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/fnext3.c-C-G1--goto-backend.in b/test/rlhc.d/case/fnext3.c-C-G1--goto-backend.in
index 4645657a..4645657a 100644
--- a/test/cases/rlhc.d/case/fnext3.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/fnext3.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/fnext3.c-C-G2--goto-backend.exp b/test/rlhc.d/case/fnext3.c-C-G2--goto-backend.exp
index 427e7c80..427e7c80 100644
--- a/test/cases/rlhc.d/case/fnext3.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/fnext3.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/fnext3.c-C-G2--goto-backend.in b/test/rlhc.d/case/fnext3.c-C-G2--goto-backend.in
index 82e1c448..82e1c448 100644
--- a/test/cases/rlhc.d/case/fnext3.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/fnext3.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/fnext3.c-C-T0--goto-backend.exp b/test/rlhc.d/case/fnext3.c-C-T0--goto-backend.exp
index e1e0fd06..e1e0fd06 100644
--- a/test/cases/rlhc.d/case/fnext3.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/fnext3.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/fnext3.c-C-T0--goto-backend.in b/test/rlhc.d/case/fnext3.c-C-T0--goto-backend.in
index ff31720f..ff31720f 100644
--- a/test/cases/rlhc.d/case/fnext3.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/fnext3.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/fnext3.c-C-T0--var-backend.exp b/test/rlhc.d/case/fnext3.c-C-T0--var-backend.exp
index 77ef7359..77ef7359 100644
--- a/test/cases/rlhc.d/case/fnext3.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/fnext3.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/fnext3.c-C-T0--var-backend.in b/test/rlhc.d/case/fnext3.c-C-T0--var-backend.in
index 5fe33bf6..5fe33bf6 100644
--- a/test/cases/rlhc.d/case/fnext3.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/fnext3.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/fnext3.c-C-T1--goto-backend.exp b/test/rlhc.d/case/fnext3.c-C-T1--goto-backend.exp
index b011a8c9..b011a8c9 100644
--- a/test/cases/rlhc.d/case/fnext3.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/fnext3.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/fnext3.c-C-T1--goto-backend.in b/test/rlhc.d/case/fnext3.c-C-T1--goto-backend.in
index aa50ff61..aa50ff61 100644
--- a/test/cases/rlhc.d/case/fnext3.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/fnext3.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/fnext3.c-C-T1--var-backend.exp b/test/rlhc.d/case/fnext3.c-C-T1--var-backend.exp
index f8814cdb..f8814cdb 100644
--- a/test/cases/rlhc.d/case/fnext3.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/fnext3.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/fnext3.c-C-T1--var-backend.in b/test/rlhc.d/case/fnext3.c-C-T1--var-backend.in
index ddd369f6..ddd369f6 100644
--- a/test/cases/rlhc.d/case/fnext3.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/fnext3.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/forder1.c-C-F0--goto-backend.exp b/test/rlhc.d/case/forder1.c-C-F0--goto-backend.exp
index 104f8ded..104f8ded 100644
--- a/test/cases/rlhc.d/case/forder1.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/forder1.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/forder1.c-C-F0--goto-backend.in b/test/rlhc.d/case/forder1.c-C-F0--goto-backend.in
index 580806cd..580806cd 100644
--- a/test/cases/rlhc.d/case/forder1.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/forder1.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/forder1.c-C-F0--var-backend.exp b/test/rlhc.d/case/forder1.c-C-F0--var-backend.exp
index 23758ecd..23758ecd 100644
--- a/test/cases/rlhc.d/case/forder1.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/forder1.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/forder1.c-C-F0--var-backend.in b/test/rlhc.d/case/forder1.c-C-F0--var-backend.in
index c22dff86..c22dff86 100644
--- a/test/cases/rlhc.d/case/forder1.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/forder1.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/forder1.c-C-F1--goto-backend.exp b/test/rlhc.d/case/forder1.c-C-F1--goto-backend.exp
index bbeb913c..bbeb913c 100644
--- a/test/cases/rlhc.d/case/forder1.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/forder1.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/forder1.c-C-F1--goto-backend.in b/test/rlhc.d/case/forder1.c-C-F1--goto-backend.in
index e89eac92..e89eac92 100644
--- a/test/cases/rlhc.d/case/forder1.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/forder1.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/forder1.c-C-F1--var-backend.exp b/test/rlhc.d/case/forder1.c-C-F1--var-backend.exp
index 5838f8d3..5838f8d3 100644
--- a/test/cases/rlhc.d/case/forder1.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/forder1.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/forder1.c-C-F1--var-backend.in b/test/rlhc.d/case/forder1.c-C-F1--var-backend.in
index 1a9e6bd5..1a9e6bd5 100644
--- a/test/cases/rlhc.d/case/forder1.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/forder1.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/forder1.c-C-G0--goto-backend.exp b/test/rlhc.d/case/forder1.c-C-G0--goto-backend.exp
index 159880cd..159880cd 100644
--- a/test/cases/rlhc.d/case/forder1.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/forder1.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/forder1.c-C-G0--goto-backend.in b/test/rlhc.d/case/forder1.c-C-G0--goto-backend.in
index fe8128e3..fe8128e3 100644
--- a/test/cases/rlhc.d/case/forder1.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/forder1.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/forder1.c-C-G1--goto-backend.exp b/test/rlhc.d/case/forder1.c-C-G1--goto-backend.exp
index 9147fa54..9147fa54 100644
--- a/test/cases/rlhc.d/case/forder1.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/forder1.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/forder1.c-C-G1--goto-backend.in b/test/rlhc.d/case/forder1.c-C-G1--goto-backend.in
index 591a001f..591a001f 100644
--- a/test/cases/rlhc.d/case/forder1.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/forder1.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/forder1.c-C-G2--goto-backend.exp b/test/rlhc.d/case/forder1.c-C-G2--goto-backend.exp
index c9dc9b36..c9dc9b36 100644
--- a/test/cases/rlhc.d/case/forder1.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/forder1.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/forder1.c-C-G2--goto-backend.in b/test/rlhc.d/case/forder1.c-C-G2--goto-backend.in
index 1aa683e6..1aa683e6 100644
--- a/test/cases/rlhc.d/case/forder1.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/forder1.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/forder1.c-C-T0--goto-backend.exp b/test/rlhc.d/case/forder1.c-C-T0--goto-backend.exp
index 765aa31a..765aa31a 100644
--- a/test/cases/rlhc.d/case/forder1.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/forder1.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/forder1.c-C-T0--goto-backend.in b/test/rlhc.d/case/forder1.c-C-T0--goto-backend.in
index 25a62e5f..25a62e5f 100644
--- a/test/cases/rlhc.d/case/forder1.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/forder1.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/forder1.c-C-T0--var-backend.exp b/test/rlhc.d/case/forder1.c-C-T0--var-backend.exp
index 6cd2b29d..6cd2b29d 100644
--- a/test/cases/rlhc.d/case/forder1.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/forder1.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/forder1.c-C-T0--var-backend.in b/test/rlhc.d/case/forder1.c-C-T0--var-backend.in
index f83dc284..f83dc284 100644
--- a/test/cases/rlhc.d/case/forder1.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/forder1.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/forder1.c-C-T1--goto-backend.exp b/test/rlhc.d/case/forder1.c-C-T1--goto-backend.exp
index 36cd6b9f..36cd6b9f 100644
--- a/test/cases/rlhc.d/case/forder1.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/forder1.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/forder1.c-C-T1--goto-backend.in b/test/rlhc.d/case/forder1.c-C-T1--goto-backend.in
index 87e37936..87e37936 100644
--- a/test/cases/rlhc.d/case/forder1.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/forder1.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/forder1.c-C-T1--var-backend.exp b/test/rlhc.d/case/forder1.c-C-T1--var-backend.exp
index 6571cada..6571cada 100644
--- a/test/cases/rlhc.d/case/forder1.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/forder1.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/forder1.c-C-T1--var-backend.in b/test/rlhc.d/case/forder1.c-C-T1--var-backend.in
index 26ab5345..26ab5345 100644
--- a/test/cases/rlhc.d/case/forder1.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/forder1.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/forder2.c-C-F0--goto-backend.exp b/test/rlhc.d/case/forder2.c-C-F0--goto-backend.exp
index 4c6f9176..4c6f9176 100644
--- a/test/cases/rlhc.d/case/forder2.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/forder2.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/forder2.c-C-F0--goto-backend.in b/test/rlhc.d/case/forder2.c-C-F0--goto-backend.in
index 56777661..56777661 100644
--- a/test/cases/rlhc.d/case/forder2.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/forder2.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/forder2.c-C-F0--var-backend.exp b/test/rlhc.d/case/forder2.c-C-F0--var-backend.exp
index 7a611e83..7a611e83 100644
--- a/test/cases/rlhc.d/case/forder2.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/forder2.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/forder2.c-C-F0--var-backend.in b/test/rlhc.d/case/forder2.c-C-F0--var-backend.in
index 5f256f93..5f256f93 100644
--- a/test/cases/rlhc.d/case/forder2.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/forder2.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/forder2.c-C-F1--goto-backend.exp b/test/rlhc.d/case/forder2.c-C-F1--goto-backend.exp
index 4ef991ac..4ef991ac 100644
--- a/test/cases/rlhc.d/case/forder2.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/forder2.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/forder2.c-C-F1--goto-backend.in b/test/rlhc.d/case/forder2.c-C-F1--goto-backend.in
index 471dac85..471dac85 100644
--- a/test/cases/rlhc.d/case/forder2.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/forder2.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/forder2.c-C-F1--var-backend.exp b/test/rlhc.d/case/forder2.c-C-F1--var-backend.exp
index b96de59f..b96de59f 100644
--- a/test/cases/rlhc.d/case/forder2.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/forder2.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/forder2.c-C-F1--var-backend.in b/test/rlhc.d/case/forder2.c-C-F1--var-backend.in
index c16c679e..c16c679e 100644
--- a/test/cases/rlhc.d/case/forder2.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/forder2.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/forder2.c-C-G0--goto-backend.exp b/test/rlhc.d/case/forder2.c-C-G0--goto-backend.exp
index b90b0e6c..b90b0e6c 100644
--- a/test/cases/rlhc.d/case/forder2.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/forder2.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/forder2.c-C-G0--goto-backend.in b/test/rlhc.d/case/forder2.c-C-G0--goto-backend.in
index a6def742..a6def742 100644
--- a/test/cases/rlhc.d/case/forder2.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/forder2.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/forder2.c-C-G1--goto-backend.exp b/test/rlhc.d/case/forder2.c-C-G1--goto-backend.exp
index 101af327..101af327 100644
--- a/test/cases/rlhc.d/case/forder2.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/forder2.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/forder2.c-C-G1--goto-backend.in b/test/rlhc.d/case/forder2.c-C-G1--goto-backend.in
index e3547ffa..e3547ffa 100644
--- a/test/cases/rlhc.d/case/forder2.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/forder2.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/forder2.c-C-G2--goto-backend.exp b/test/rlhc.d/case/forder2.c-C-G2--goto-backend.exp
index 78fdc13e..78fdc13e 100644
--- a/test/cases/rlhc.d/case/forder2.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/forder2.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/forder2.c-C-G2--goto-backend.in b/test/rlhc.d/case/forder2.c-C-G2--goto-backend.in
index c8ce24fc..c8ce24fc 100644
--- a/test/cases/rlhc.d/case/forder2.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/forder2.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/forder2.c-C-T0--goto-backend.exp b/test/rlhc.d/case/forder2.c-C-T0--goto-backend.exp
index 118f9cda..118f9cda 100644
--- a/test/cases/rlhc.d/case/forder2.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/forder2.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/forder2.c-C-T0--goto-backend.in b/test/rlhc.d/case/forder2.c-C-T0--goto-backend.in
index 5083b73c..5083b73c 100644
--- a/test/cases/rlhc.d/case/forder2.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/forder2.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/forder2.c-C-T0--var-backend.exp b/test/rlhc.d/case/forder2.c-C-T0--var-backend.exp
index e8257e06..e8257e06 100644
--- a/test/cases/rlhc.d/case/forder2.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/forder2.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/forder2.c-C-T0--var-backend.in b/test/rlhc.d/case/forder2.c-C-T0--var-backend.in
index b34681de..b34681de 100644
--- a/test/cases/rlhc.d/case/forder2.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/forder2.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/forder2.c-C-T1--goto-backend.exp b/test/rlhc.d/case/forder2.c-C-T1--goto-backend.exp
index 353e0a0d..353e0a0d 100644
--- a/test/cases/rlhc.d/case/forder2.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/forder2.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/forder2.c-C-T1--goto-backend.in b/test/rlhc.d/case/forder2.c-C-T1--goto-backend.in
index 5dc860f4..5dc860f4 100644
--- a/test/cases/rlhc.d/case/forder2.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/forder2.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/forder2.c-C-T1--var-backend.exp b/test/rlhc.d/case/forder2.c-C-T1--var-backend.exp
index 506a295a..506a295a 100644
--- a/test/cases/rlhc.d/case/forder2.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/forder2.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/forder2.c-C-T1--var-backend.in b/test/rlhc.d/case/forder2.c-C-T1--var-backend.in
index affebaa4..affebaa4 100644
--- a/test/cases/rlhc.d/case/forder2.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/forder2.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/forder3.c-C-F0--goto-backend.exp b/test/rlhc.d/case/forder3.c-C-F0--goto-backend.exp
index 24fb07bb..24fb07bb 100644
--- a/test/cases/rlhc.d/case/forder3.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/forder3.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/forder3.c-C-F0--goto-backend.in b/test/rlhc.d/case/forder3.c-C-F0--goto-backend.in
index 1f9fb452..1f9fb452 100644
--- a/test/cases/rlhc.d/case/forder3.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/forder3.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/forder3.c-C-F0--var-backend.exp b/test/rlhc.d/case/forder3.c-C-F0--var-backend.exp
index 1305378b..1305378b 100644
--- a/test/cases/rlhc.d/case/forder3.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/forder3.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/forder3.c-C-F0--var-backend.in b/test/rlhc.d/case/forder3.c-C-F0--var-backend.in
index a2f219f8..a2f219f8 100644
--- a/test/cases/rlhc.d/case/forder3.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/forder3.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/forder3.c-C-F1--goto-backend.exp b/test/rlhc.d/case/forder3.c-C-F1--goto-backend.exp
index bdc1b218..bdc1b218 100644
--- a/test/cases/rlhc.d/case/forder3.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/forder3.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/forder3.c-C-F1--goto-backend.in b/test/rlhc.d/case/forder3.c-C-F1--goto-backend.in
index 1449d1a3..1449d1a3 100644
--- a/test/cases/rlhc.d/case/forder3.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/forder3.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/forder3.c-C-F1--var-backend.exp b/test/rlhc.d/case/forder3.c-C-F1--var-backend.exp
index 8c6de6b1..8c6de6b1 100644
--- a/test/cases/rlhc.d/case/forder3.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/forder3.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/forder3.c-C-F1--var-backend.in b/test/rlhc.d/case/forder3.c-C-F1--var-backend.in
index 39ae6530..39ae6530 100644
--- a/test/cases/rlhc.d/case/forder3.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/forder3.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/forder3.c-C-G0--goto-backend.exp b/test/rlhc.d/case/forder3.c-C-G0--goto-backend.exp
index e9d3855a..e9d3855a 100644
--- a/test/cases/rlhc.d/case/forder3.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/forder3.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/forder3.c-C-G0--goto-backend.in b/test/rlhc.d/case/forder3.c-C-G0--goto-backend.in
index 58f33541..58f33541 100644
--- a/test/cases/rlhc.d/case/forder3.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/forder3.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/forder3.c-C-G1--goto-backend.exp b/test/rlhc.d/case/forder3.c-C-G1--goto-backend.exp
index dee583f5..dee583f5 100644
--- a/test/cases/rlhc.d/case/forder3.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/forder3.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/forder3.c-C-G1--goto-backend.in b/test/rlhc.d/case/forder3.c-C-G1--goto-backend.in
index 79c6a970..79c6a970 100644
--- a/test/cases/rlhc.d/case/forder3.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/forder3.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/forder3.c-C-G2--goto-backend.exp b/test/rlhc.d/case/forder3.c-C-G2--goto-backend.exp
index bcfd2ac0..bcfd2ac0 100644
--- a/test/cases/rlhc.d/case/forder3.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/forder3.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/forder3.c-C-G2--goto-backend.in b/test/rlhc.d/case/forder3.c-C-G2--goto-backend.in
index 957b9399..957b9399 100644
--- a/test/cases/rlhc.d/case/forder3.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/forder3.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/forder3.c-C-T0--goto-backend.exp b/test/rlhc.d/case/forder3.c-C-T0--goto-backend.exp
index 751cd65c..751cd65c 100644
--- a/test/cases/rlhc.d/case/forder3.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/forder3.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/forder3.c-C-T0--goto-backend.in b/test/rlhc.d/case/forder3.c-C-T0--goto-backend.in
index 02f5462a..02f5462a 100644
--- a/test/cases/rlhc.d/case/forder3.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/forder3.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/forder3.c-C-T0--var-backend.exp b/test/rlhc.d/case/forder3.c-C-T0--var-backend.exp
index b1e4fea5..b1e4fea5 100644
--- a/test/cases/rlhc.d/case/forder3.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/forder3.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/forder3.c-C-T0--var-backend.in b/test/rlhc.d/case/forder3.c-C-T0--var-backend.in
index 6e3d5ef2..6e3d5ef2 100644
--- a/test/cases/rlhc.d/case/forder3.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/forder3.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/forder3.c-C-T1--goto-backend.exp b/test/rlhc.d/case/forder3.c-C-T1--goto-backend.exp
index caa7d185..caa7d185 100644
--- a/test/cases/rlhc.d/case/forder3.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/forder3.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/forder3.c-C-T1--goto-backend.in b/test/rlhc.d/case/forder3.c-C-T1--goto-backend.in
index a3991cb7..a3991cb7 100644
--- a/test/cases/rlhc.d/case/forder3.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/forder3.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/forder3.c-C-T1--var-backend.exp b/test/rlhc.d/case/forder3.c-C-T1--var-backend.exp
index 17c2ce33..17c2ce33 100644
--- a/test/cases/rlhc.d/case/forder3.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/forder3.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/forder3.c-C-T1--var-backend.in b/test/rlhc.d/case/forder3.c-C-T1--var-backend.in
index 1f4b94f8..1f4b94f8 100644
--- a/test/cases/rlhc.d/case/forder3.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/forder3.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/genrep1.c-C-F0--goto-backend.exp b/test/rlhc.d/case/genrep1.c-C-F0--goto-backend.exp
index 26387d85..26387d85 100644
--- a/test/cases/rlhc.d/case/genrep1.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/genrep1.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep1.c-C-F0--goto-backend.in b/test/rlhc.d/case/genrep1.c-C-F0--goto-backend.in
index 66563001..66563001 100644
--- a/test/cases/rlhc.d/case/genrep1.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/genrep1.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/genrep1.c-C-F0--var-backend.exp b/test/rlhc.d/case/genrep1.c-C-F0--var-backend.exp
index 09c923fd..09c923fd 100644
--- a/test/cases/rlhc.d/case/genrep1.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/genrep1.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep1.c-C-F0--var-backend.in b/test/rlhc.d/case/genrep1.c-C-F0--var-backend.in
index 087bb652..087bb652 100644
--- a/test/cases/rlhc.d/case/genrep1.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/genrep1.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/genrep1.c-C-F1--goto-backend.exp b/test/rlhc.d/case/genrep1.c-C-F1--goto-backend.exp
index 97befe18..97befe18 100644
--- a/test/cases/rlhc.d/case/genrep1.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/genrep1.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep1.c-C-F1--goto-backend.in b/test/rlhc.d/case/genrep1.c-C-F1--goto-backend.in
index adeb6c10..adeb6c10 100644
--- a/test/cases/rlhc.d/case/genrep1.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/genrep1.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/genrep1.c-C-F1--var-backend.exp b/test/rlhc.d/case/genrep1.c-C-F1--var-backend.exp
index bed40c0f..bed40c0f 100644
--- a/test/cases/rlhc.d/case/genrep1.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/genrep1.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep1.c-C-F1--var-backend.in b/test/rlhc.d/case/genrep1.c-C-F1--var-backend.in
index f8efc35c..f8efc35c 100644
--- a/test/cases/rlhc.d/case/genrep1.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/genrep1.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/genrep1.c-C-G0--goto-backend.exp b/test/rlhc.d/case/genrep1.c-C-G0--goto-backend.exp
index 5ecea1fc..5ecea1fc 100644
--- a/test/cases/rlhc.d/case/genrep1.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/genrep1.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep1.c-C-G0--goto-backend.in b/test/rlhc.d/case/genrep1.c-C-G0--goto-backend.in
index ad58841e..ad58841e 100644
--- a/test/cases/rlhc.d/case/genrep1.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/genrep1.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/genrep1.c-C-G1--goto-backend.exp b/test/rlhc.d/case/genrep1.c-C-G1--goto-backend.exp
index c83454d8..c83454d8 100644
--- a/test/cases/rlhc.d/case/genrep1.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/genrep1.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep1.c-C-G1--goto-backend.in b/test/rlhc.d/case/genrep1.c-C-G1--goto-backend.in
index 93ed6a6d..93ed6a6d 100644
--- a/test/cases/rlhc.d/case/genrep1.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/genrep1.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/genrep1.c-C-G2--goto-backend.exp b/test/rlhc.d/case/genrep1.c-C-G2--goto-backend.exp
index 23c302f5..23c302f5 100644
--- a/test/cases/rlhc.d/case/genrep1.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/genrep1.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep1.c-C-G2--goto-backend.in b/test/rlhc.d/case/genrep1.c-C-G2--goto-backend.in
index cbb039bd..cbb039bd 100644
--- a/test/cases/rlhc.d/case/genrep1.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/genrep1.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/genrep1.c-C-T0--goto-backend.exp b/test/rlhc.d/case/genrep1.c-C-T0--goto-backend.exp
index ed1e818b..ed1e818b 100644
--- a/test/cases/rlhc.d/case/genrep1.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/genrep1.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep1.c-C-T0--goto-backend.in b/test/rlhc.d/case/genrep1.c-C-T0--goto-backend.in
index 0359eb80..0359eb80 100644
--- a/test/cases/rlhc.d/case/genrep1.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/genrep1.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/genrep1.c-C-T0--var-backend.exp b/test/rlhc.d/case/genrep1.c-C-T0--var-backend.exp
index 38c27769..38c27769 100644
--- a/test/cases/rlhc.d/case/genrep1.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/genrep1.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep1.c-C-T0--var-backend.in b/test/rlhc.d/case/genrep1.c-C-T0--var-backend.in
index 68521127..68521127 100644
--- a/test/cases/rlhc.d/case/genrep1.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/genrep1.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/genrep1.c-C-T1--goto-backend.exp b/test/rlhc.d/case/genrep1.c-C-T1--goto-backend.exp
index 5cd91879..5cd91879 100644
--- a/test/cases/rlhc.d/case/genrep1.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/genrep1.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep1.c-C-T1--goto-backend.in b/test/rlhc.d/case/genrep1.c-C-T1--goto-backend.in
index d3e21265..d3e21265 100644
--- a/test/cases/rlhc.d/case/genrep1.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/genrep1.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/genrep1.c-C-T1--var-backend.exp b/test/rlhc.d/case/genrep1.c-C-T1--var-backend.exp
index 742c7932..742c7932 100644
--- a/test/cases/rlhc.d/case/genrep1.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/genrep1.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep1.c-C-T1--var-backend.in b/test/rlhc.d/case/genrep1.c-C-T1--var-backend.in
index ed1a6925..ed1a6925 100644
--- a/test/cases/rlhc.d/case/genrep1.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/genrep1.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/genrep2.c-C-F0--goto-backend.exp b/test/rlhc.d/case/genrep2.c-C-F0--goto-backend.exp
index d31adf4a..d31adf4a 100644
--- a/test/cases/rlhc.d/case/genrep2.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/genrep2.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep2.c-C-F0--goto-backend.in b/test/rlhc.d/case/genrep2.c-C-F0--goto-backend.in
index 99231224..99231224 100644
--- a/test/cases/rlhc.d/case/genrep2.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/genrep2.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/genrep2.c-C-F0--var-backend.exp b/test/rlhc.d/case/genrep2.c-C-F0--var-backend.exp
index 007a9930..007a9930 100644
--- a/test/cases/rlhc.d/case/genrep2.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/genrep2.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep2.c-C-F0--var-backend.in b/test/rlhc.d/case/genrep2.c-C-F0--var-backend.in
index 4d7e8ff7..4d7e8ff7 100644
--- a/test/cases/rlhc.d/case/genrep2.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/genrep2.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/genrep2.c-C-F1--goto-backend.exp b/test/rlhc.d/case/genrep2.c-C-F1--goto-backend.exp
index ae2a256f..ae2a256f 100644
--- a/test/cases/rlhc.d/case/genrep2.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/genrep2.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep2.c-C-F1--goto-backend.in b/test/rlhc.d/case/genrep2.c-C-F1--goto-backend.in
index 2cfb0e1a..2cfb0e1a 100644
--- a/test/cases/rlhc.d/case/genrep2.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/genrep2.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/genrep2.c-C-F1--var-backend.exp b/test/rlhc.d/case/genrep2.c-C-F1--var-backend.exp
index 23b5f4ad..23b5f4ad 100644
--- a/test/cases/rlhc.d/case/genrep2.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/genrep2.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep2.c-C-F1--var-backend.in b/test/rlhc.d/case/genrep2.c-C-F1--var-backend.in
index 94026aaf..94026aaf 100644
--- a/test/cases/rlhc.d/case/genrep2.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/genrep2.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/genrep2.c-C-G0--goto-backend.exp b/test/rlhc.d/case/genrep2.c-C-G0--goto-backend.exp
index 7a348ec6..7a348ec6 100644
--- a/test/cases/rlhc.d/case/genrep2.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/genrep2.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep2.c-C-G0--goto-backend.in b/test/rlhc.d/case/genrep2.c-C-G0--goto-backend.in
index aa8ec10f..aa8ec10f 100644
--- a/test/cases/rlhc.d/case/genrep2.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/genrep2.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/genrep2.c-C-G1--goto-backend.exp b/test/rlhc.d/case/genrep2.c-C-G1--goto-backend.exp
index e024737f..e024737f 100644
--- a/test/cases/rlhc.d/case/genrep2.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/genrep2.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep2.c-C-G1--goto-backend.in b/test/rlhc.d/case/genrep2.c-C-G1--goto-backend.in
index d7ffb91b..d7ffb91b 100644
--- a/test/cases/rlhc.d/case/genrep2.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/genrep2.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/genrep2.c-C-G2--goto-backend.exp b/test/rlhc.d/case/genrep2.c-C-G2--goto-backend.exp
index 60900112..60900112 100644
--- a/test/cases/rlhc.d/case/genrep2.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/genrep2.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep2.c-C-G2--goto-backend.in b/test/rlhc.d/case/genrep2.c-C-G2--goto-backend.in
index 65fd430b..65fd430b 100644
--- a/test/cases/rlhc.d/case/genrep2.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/genrep2.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/genrep2.c-C-T0--goto-backend.exp b/test/rlhc.d/case/genrep2.c-C-T0--goto-backend.exp
index 614f0d77..614f0d77 100644
--- a/test/cases/rlhc.d/case/genrep2.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/genrep2.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep2.c-C-T0--goto-backend.in b/test/rlhc.d/case/genrep2.c-C-T0--goto-backend.in
index b1b2f72b..b1b2f72b 100644
--- a/test/cases/rlhc.d/case/genrep2.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/genrep2.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/genrep2.c-C-T0--var-backend.exp b/test/rlhc.d/case/genrep2.c-C-T0--var-backend.exp
index 79eab802..79eab802 100644
--- a/test/cases/rlhc.d/case/genrep2.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/genrep2.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep2.c-C-T0--var-backend.in b/test/rlhc.d/case/genrep2.c-C-T0--var-backend.in
index be74fc73..be74fc73 100644
--- a/test/cases/rlhc.d/case/genrep2.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/genrep2.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/genrep2.c-C-T1--goto-backend.exp b/test/rlhc.d/case/genrep2.c-C-T1--goto-backend.exp
index a6654db9..a6654db9 100644
--- a/test/cases/rlhc.d/case/genrep2.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/genrep2.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep2.c-C-T1--goto-backend.in b/test/rlhc.d/case/genrep2.c-C-T1--goto-backend.in
index 1b598caa..1b598caa 100644
--- a/test/cases/rlhc.d/case/genrep2.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/genrep2.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/genrep2.c-C-T1--var-backend.exp b/test/rlhc.d/case/genrep2.c-C-T1--var-backend.exp
index 4cecf74c..4cecf74c 100644
--- a/test/cases/rlhc.d/case/genrep2.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/genrep2.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep2.c-C-T1--var-backend.in b/test/rlhc.d/case/genrep2.c-C-T1--var-backend.in
index 222de147..222de147 100644
--- a/test/cases/rlhc.d/case/genrep2.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/genrep2.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/genrep4.c-C-F0--goto-backend.exp b/test/rlhc.d/case/genrep4.c-C-F0--goto-backend.exp
index 019dd201..019dd201 100644
--- a/test/cases/rlhc.d/case/genrep4.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/genrep4.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep4.c-C-F0--goto-backend.in b/test/rlhc.d/case/genrep4.c-C-F0--goto-backend.in
index 14ce7b54..14ce7b54 100644
--- a/test/cases/rlhc.d/case/genrep4.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/genrep4.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/genrep4.c-C-F0--var-backend.exp b/test/rlhc.d/case/genrep4.c-C-F0--var-backend.exp
index e4dc7c66..e4dc7c66 100644
--- a/test/cases/rlhc.d/case/genrep4.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/genrep4.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep4.c-C-F0--var-backend.in b/test/rlhc.d/case/genrep4.c-C-F0--var-backend.in
index f5aaeb62..f5aaeb62 100644
--- a/test/cases/rlhc.d/case/genrep4.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/genrep4.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/genrep4.c-C-F1--goto-backend.exp b/test/rlhc.d/case/genrep4.c-C-F1--goto-backend.exp
index fab52fb2..fab52fb2 100644
--- a/test/cases/rlhc.d/case/genrep4.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/genrep4.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep4.c-C-F1--goto-backend.in b/test/rlhc.d/case/genrep4.c-C-F1--goto-backend.in
index 01ce7e73..01ce7e73 100644
--- a/test/cases/rlhc.d/case/genrep4.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/genrep4.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/genrep4.c-C-F1--var-backend.exp b/test/rlhc.d/case/genrep4.c-C-F1--var-backend.exp
index bb8d8119..bb8d8119 100644
--- a/test/cases/rlhc.d/case/genrep4.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/genrep4.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep4.c-C-F1--var-backend.in b/test/rlhc.d/case/genrep4.c-C-F1--var-backend.in
index eb2c12ac..eb2c12ac 100644
--- a/test/cases/rlhc.d/case/genrep4.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/genrep4.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/genrep4.c-C-G0--goto-backend.exp b/test/rlhc.d/case/genrep4.c-C-G0--goto-backend.exp
index e81df58e..e81df58e 100644
--- a/test/cases/rlhc.d/case/genrep4.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/genrep4.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep4.c-C-G0--goto-backend.in b/test/rlhc.d/case/genrep4.c-C-G0--goto-backend.in
index db25d383..db25d383 100644
--- a/test/cases/rlhc.d/case/genrep4.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/genrep4.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/genrep4.c-C-G1--goto-backend.exp b/test/rlhc.d/case/genrep4.c-C-G1--goto-backend.exp
index 3fe6ba84..3fe6ba84 100644
--- a/test/cases/rlhc.d/case/genrep4.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/genrep4.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep4.c-C-G1--goto-backend.in b/test/rlhc.d/case/genrep4.c-C-G1--goto-backend.in
index 3074d0ba..3074d0ba 100644
--- a/test/cases/rlhc.d/case/genrep4.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/genrep4.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/genrep4.c-C-G2--goto-backend.exp b/test/rlhc.d/case/genrep4.c-C-G2--goto-backend.exp
index 77e1ade0..77e1ade0 100644
--- a/test/cases/rlhc.d/case/genrep4.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/genrep4.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep4.c-C-G2--goto-backend.in b/test/rlhc.d/case/genrep4.c-C-G2--goto-backend.in
index 9b841d47..9b841d47 100644
--- a/test/cases/rlhc.d/case/genrep4.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/genrep4.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/genrep4.c-C-T0--goto-backend.exp b/test/rlhc.d/case/genrep4.c-C-T0--goto-backend.exp
index 4f7087fe..4f7087fe 100644
--- a/test/cases/rlhc.d/case/genrep4.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/genrep4.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep4.c-C-T0--goto-backend.in b/test/rlhc.d/case/genrep4.c-C-T0--goto-backend.in
index 7432ead9..7432ead9 100644
--- a/test/cases/rlhc.d/case/genrep4.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/genrep4.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/genrep4.c-C-T0--var-backend.exp b/test/rlhc.d/case/genrep4.c-C-T0--var-backend.exp
index 310f504a..310f504a 100644
--- a/test/cases/rlhc.d/case/genrep4.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/genrep4.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep4.c-C-T0--var-backend.in b/test/rlhc.d/case/genrep4.c-C-T0--var-backend.in
index fc83b108..fc83b108 100644
--- a/test/cases/rlhc.d/case/genrep4.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/genrep4.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/genrep4.c-C-T1--goto-backend.exp b/test/rlhc.d/case/genrep4.c-C-T1--goto-backend.exp
index c6121a31..c6121a31 100644
--- a/test/cases/rlhc.d/case/genrep4.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/genrep4.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep4.c-C-T1--goto-backend.in b/test/rlhc.d/case/genrep4.c-C-T1--goto-backend.in
index 12cc351b..12cc351b 100644
--- a/test/cases/rlhc.d/case/genrep4.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/genrep4.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/genrep4.c-C-T1--var-backend.exp b/test/rlhc.d/case/genrep4.c-C-T1--var-backend.exp
index 09389067..09389067 100644
--- a/test/cases/rlhc.d/case/genrep4.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/genrep4.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep4.c-C-T1--var-backend.in b/test/rlhc.d/case/genrep4.c-C-T1--var-backend.in
index 3458e795..3458e795 100644
--- a/test/cases/rlhc.d/case/genrep4.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/genrep4.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/genrep5.c-C-F0--goto-backend.exp b/test/rlhc.d/case/genrep5.c-C-F0--goto-backend.exp
index ac9cd471..ac9cd471 100644
--- a/test/cases/rlhc.d/case/genrep5.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/genrep5.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep5.c-C-F0--goto-backend.in b/test/rlhc.d/case/genrep5.c-C-F0--goto-backend.in
index 28ce4f6b..28ce4f6b 100644
--- a/test/cases/rlhc.d/case/genrep5.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/genrep5.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/genrep5.c-C-F0--var-backend.exp b/test/rlhc.d/case/genrep5.c-C-F0--var-backend.exp
index 49875e77..49875e77 100644
--- a/test/cases/rlhc.d/case/genrep5.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/genrep5.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep5.c-C-F0--var-backend.in b/test/rlhc.d/case/genrep5.c-C-F0--var-backend.in
index 1c428508..1c428508 100644
--- a/test/cases/rlhc.d/case/genrep5.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/genrep5.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/genrep5.c-C-F1--goto-backend.exp b/test/rlhc.d/case/genrep5.c-C-F1--goto-backend.exp
index 9cad9f31..9cad9f31 100644
--- a/test/cases/rlhc.d/case/genrep5.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/genrep5.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep5.c-C-F1--goto-backend.in b/test/rlhc.d/case/genrep5.c-C-F1--goto-backend.in
index 08ca4818..08ca4818 100644
--- a/test/cases/rlhc.d/case/genrep5.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/genrep5.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/genrep5.c-C-F1--var-backend.exp b/test/rlhc.d/case/genrep5.c-C-F1--var-backend.exp
index 54d4a7a8..54d4a7a8 100644
--- a/test/cases/rlhc.d/case/genrep5.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/genrep5.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep5.c-C-F1--var-backend.in b/test/rlhc.d/case/genrep5.c-C-F1--var-backend.in
index b97b471c..b97b471c 100644
--- a/test/cases/rlhc.d/case/genrep5.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/genrep5.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/genrep5.c-C-G0--goto-backend.exp b/test/rlhc.d/case/genrep5.c-C-G0--goto-backend.exp
index 820a65f1..820a65f1 100644
--- a/test/cases/rlhc.d/case/genrep5.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/genrep5.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep5.c-C-G0--goto-backend.in b/test/rlhc.d/case/genrep5.c-C-G0--goto-backend.in
index 8ad1f07c..8ad1f07c 100644
--- a/test/cases/rlhc.d/case/genrep5.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/genrep5.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/genrep5.c-C-G1--goto-backend.exp b/test/rlhc.d/case/genrep5.c-C-G1--goto-backend.exp
index 1a638aa7..1a638aa7 100644
--- a/test/cases/rlhc.d/case/genrep5.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/genrep5.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep5.c-C-G1--goto-backend.in b/test/rlhc.d/case/genrep5.c-C-G1--goto-backend.in
index dcd61672..dcd61672 100644
--- a/test/cases/rlhc.d/case/genrep5.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/genrep5.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/genrep5.c-C-G2--goto-backend.exp b/test/rlhc.d/case/genrep5.c-C-G2--goto-backend.exp
index 209e4588..209e4588 100644
--- a/test/cases/rlhc.d/case/genrep5.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/genrep5.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep5.c-C-G2--goto-backend.in b/test/rlhc.d/case/genrep5.c-C-G2--goto-backend.in
index eacc724c..eacc724c 100644
--- a/test/cases/rlhc.d/case/genrep5.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/genrep5.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/genrep5.c-C-T0--goto-backend.exp b/test/rlhc.d/case/genrep5.c-C-T0--goto-backend.exp
index 861ab54c..861ab54c 100644
--- a/test/cases/rlhc.d/case/genrep5.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/genrep5.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep5.c-C-T0--goto-backend.in b/test/rlhc.d/case/genrep5.c-C-T0--goto-backend.in
index dfcfa135..dfcfa135 100644
--- a/test/cases/rlhc.d/case/genrep5.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/genrep5.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/genrep5.c-C-T0--var-backend.exp b/test/rlhc.d/case/genrep5.c-C-T0--var-backend.exp
index b7797ccb..b7797ccb 100644
--- a/test/cases/rlhc.d/case/genrep5.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/genrep5.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep5.c-C-T0--var-backend.in b/test/rlhc.d/case/genrep5.c-C-T0--var-backend.in
index 88881ae5..88881ae5 100644
--- a/test/cases/rlhc.d/case/genrep5.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/genrep5.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/genrep5.c-C-T1--goto-backend.exp b/test/rlhc.d/case/genrep5.c-C-T1--goto-backend.exp
index 7c9e0866..7c9e0866 100644
--- a/test/cases/rlhc.d/case/genrep5.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/genrep5.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep5.c-C-T1--goto-backend.in b/test/rlhc.d/case/genrep5.c-C-T1--goto-backend.in
index 8ae8e779..8ae8e779 100644
--- a/test/cases/rlhc.d/case/genrep5.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/genrep5.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/genrep5.c-C-T1--var-backend.exp b/test/rlhc.d/case/genrep5.c-C-T1--var-backend.exp
index 44631942..44631942 100644
--- a/test/cases/rlhc.d/case/genrep5.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/genrep5.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep5.c-C-T1--var-backend.in b/test/rlhc.d/case/genrep5.c-C-T1--var-backend.in
index b48a24b5..b48a24b5 100644
--- a/test/cases/rlhc.d/case/genrep5.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/genrep5.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/genrep6.c-C-F0--goto-backend.exp b/test/rlhc.d/case/genrep6.c-C-F0--goto-backend.exp
index ab49d46c..ab49d46c 100644
--- a/test/cases/rlhc.d/case/genrep6.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/genrep6.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep6.c-C-F0--goto-backend.in b/test/rlhc.d/case/genrep6.c-C-F0--goto-backend.in
index aa87aa3f..aa87aa3f 100644
--- a/test/cases/rlhc.d/case/genrep6.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/genrep6.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/genrep6.c-C-F0--var-backend.exp b/test/rlhc.d/case/genrep6.c-C-F0--var-backend.exp
index b6c25641..b6c25641 100644
--- a/test/cases/rlhc.d/case/genrep6.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/genrep6.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep6.c-C-F0--var-backend.in b/test/rlhc.d/case/genrep6.c-C-F0--var-backend.in
index 8c5e82ad..8c5e82ad 100644
--- a/test/cases/rlhc.d/case/genrep6.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/genrep6.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/genrep6.c-C-F1--goto-backend.exp b/test/rlhc.d/case/genrep6.c-C-F1--goto-backend.exp
index f066de34..f066de34 100644
--- a/test/cases/rlhc.d/case/genrep6.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/genrep6.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep6.c-C-F1--goto-backend.in b/test/rlhc.d/case/genrep6.c-C-F1--goto-backend.in
index de0c2708..de0c2708 100644
--- a/test/cases/rlhc.d/case/genrep6.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/genrep6.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/genrep6.c-C-F1--var-backend.exp b/test/rlhc.d/case/genrep6.c-C-F1--var-backend.exp
index e30e3f0b..e30e3f0b 100644
--- a/test/cases/rlhc.d/case/genrep6.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/genrep6.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep6.c-C-F1--var-backend.in b/test/rlhc.d/case/genrep6.c-C-F1--var-backend.in
index 87e5c306..87e5c306 100644
--- a/test/cases/rlhc.d/case/genrep6.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/genrep6.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/genrep6.c-C-G0--goto-backend.exp b/test/rlhc.d/case/genrep6.c-C-G0--goto-backend.exp
index 19ea60c2..19ea60c2 100644
--- a/test/cases/rlhc.d/case/genrep6.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/genrep6.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep6.c-C-G0--goto-backend.in b/test/rlhc.d/case/genrep6.c-C-G0--goto-backend.in
index 6f35bfcc..6f35bfcc 100644
--- a/test/cases/rlhc.d/case/genrep6.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/genrep6.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/genrep6.c-C-G1--goto-backend.exp b/test/rlhc.d/case/genrep6.c-C-G1--goto-backend.exp
index cd1f4a60..cd1f4a60 100644
--- a/test/cases/rlhc.d/case/genrep6.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/genrep6.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep6.c-C-G1--goto-backend.in b/test/rlhc.d/case/genrep6.c-C-G1--goto-backend.in
index dc99ce03..dc99ce03 100644
--- a/test/cases/rlhc.d/case/genrep6.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/genrep6.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/genrep6.c-C-G2--goto-backend.exp b/test/rlhc.d/case/genrep6.c-C-G2--goto-backend.exp
index 5afc0949..5afc0949 100644
--- a/test/cases/rlhc.d/case/genrep6.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/genrep6.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep6.c-C-G2--goto-backend.in b/test/rlhc.d/case/genrep6.c-C-G2--goto-backend.in
index c6765fec..c6765fec 100644
--- a/test/cases/rlhc.d/case/genrep6.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/genrep6.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/genrep6.c-C-T0--goto-backend.exp b/test/rlhc.d/case/genrep6.c-C-T0--goto-backend.exp
index 6946e5a8..6946e5a8 100644
--- a/test/cases/rlhc.d/case/genrep6.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/genrep6.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep6.c-C-T0--goto-backend.in b/test/rlhc.d/case/genrep6.c-C-T0--goto-backend.in
index ec6c6ca0..ec6c6ca0 100644
--- a/test/cases/rlhc.d/case/genrep6.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/genrep6.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/genrep6.c-C-T0--var-backend.exp b/test/rlhc.d/case/genrep6.c-C-T0--var-backend.exp
index d233409f..d233409f 100644
--- a/test/cases/rlhc.d/case/genrep6.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/genrep6.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep6.c-C-T0--var-backend.in b/test/rlhc.d/case/genrep6.c-C-T0--var-backend.in
index c2f618ae..c2f618ae 100644
--- a/test/cases/rlhc.d/case/genrep6.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/genrep6.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/genrep6.c-C-T1--goto-backend.exp b/test/rlhc.d/case/genrep6.c-C-T1--goto-backend.exp
index 0850b560..0850b560 100644
--- a/test/cases/rlhc.d/case/genrep6.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/genrep6.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep6.c-C-T1--goto-backend.in b/test/rlhc.d/case/genrep6.c-C-T1--goto-backend.in
index d67acf77..d67acf77 100644
--- a/test/cases/rlhc.d/case/genrep6.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/genrep6.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/genrep6.c-C-T1--var-backend.exp b/test/rlhc.d/case/genrep6.c-C-T1--var-backend.exp
index 18856531..18856531 100644
--- a/test/cases/rlhc.d/case/genrep6.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/genrep6.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/genrep6.c-C-T1--var-backend.in b/test/rlhc.d/case/genrep6.c-C-T1--var-backend.in
index a328fafe..a328fafe 100644
--- a/test/cases/rlhc.d/case/genrep6.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/genrep6.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_c.c-C-F0--goto-backend.exp b/test/rlhc.d/case/goto1_c.c-C-F0--goto-backend.exp
index 2a52a473..2a52a473 100644
--- a/test/cases/rlhc.d/case/goto1_c.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/goto1_c.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_c.c-C-F0--goto-backend.in b/test/rlhc.d/case/goto1_c.c-C-F0--goto-backend.in
index ae98bdec..ae98bdec 100644
--- a/test/cases/rlhc.d/case/goto1_c.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/goto1_c.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_c.c-C-F0--var-backend.exp b/test/rlhc.d/case/goto1_c.c-C-F0--var-backend.exp
index c84ac241..c84ac241 100644
--- a/test/cases/rlhc.d/case/goto1_c.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/goto1_c.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_c.c-C-F0--var-backend.in b/test/rlhc.d/case/goto1_c.c-C-F0--var-backend.in
index ec4a310f..ec4a310f 100644
--- a/test/cases/rlhc.d/case/goto1_c.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/goto1_c.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_c.c-C-F1--goto-backend.exp b/test/rlhc.d/case/goto1_c.c-C-F1--goto-backend.exp
index c6b25a14..c6b25a14 100644
--- a/test/cases/rlhc.d/case/goto1_c.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/goto1_c.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_c.c-C-F1--goto-backend.in b/test/rlhc.d/case/goto1_c.c-C-F1--goto-backend.in
index 34e1cdc0..34e1cdc0 100644
--- a/test/cases/rlhc.d/case/goto1_c.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/goto1_c.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_c.c-C-F1--var-backend.exp b/test/rlhc.d/case/goto1_c.c-C-F1--var-backend.exp
index 528cb1ef..528cb1ef 100644
--- a/test/cases/rlhc.d/case/goto1_c.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/goto1_c.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_c.c-C-F1--var-backend.in b/test/rlhc.d/case/goto1_c.c-C-F1--var-backend.in
index 00ea995a..00ea995a 100644
--- a/test/cases/rlhc.d/case/goto1_c.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/goto1_c.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_c.c-C-G0--goto-backend.exp b/test/rlhc.d/case/goto1_c.c-C-G0--goto-backend.exp
index dc26e672..dc26e672 100644
--- a/test/cases/rlhc.d/case/goto1_c.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/goto1_c.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_c.c-C-G0--goto-backend.in b/test/rlhc.d/case/goto1_c.c-C-G0--goto-backend.in
index fc31b69b..fc31b69b 100644
--- a/test/cases/rlhc.d/case/goto1_c.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/goto1_c.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_c.c-C-G1--goto-backend.exp b/test/rlhc.d/case/goto1_c.c-C-G1--goto-backend.exp
index 3dc06e07..3dc06e07 100644
--- a/test/cases/rlhc.d/case/goto1_c.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/goto1_c.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_c.c-C-G1--goto-backend.in b/test/rlhc.d/case/goto1_c.c-C-G1--goto-backend.in
index 5f8ee621..5f8ee621 100644
--- a/test/cases/rlhc.d/case/goto1_c.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/goto1_c.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_c.c-C-G2--goto-backend.exp b/test/rlhc.d/case/goto1_c.c-C-G2--goto-backend.exp
index c5774bd0..c5774bd0 100644
--- a/test/cases/rlhc.d/case/goto1_c.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/goto1_c.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_c.c-C-G2--goto-backend.in b/test/rlhc.d/case/goto1_c.c-C-G2--goto-backend.in
index d7642c44..d7642c44 100644
--- a/test/cases/rlhc.d/case/goto1_c.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/goto1_c.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_c.c-C-T0--goto-backend.exp b/test/rlhc.d/case/goto1_c.c-C-T0--goto-backend.exp
index af14b762..af14b762 100644
--- a/test/cases/rlhc.d/case/goto1_c.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/goto1_c.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_c.c-C-T0--goto-backend.in b/test/rlhc.d/case/goto1_c.c-C-T0--goto-backend.in
index a571ae31..a571ae31 100644
--- a/test/cases/rlhc.d/case/goto1_c.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/goto1_c.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_c.c-C-T0--var-backend.exp b/test/rlhc.d/case/goto1_c.c-C-T0--var-backend.exp
index d8a0f5b6..d8a0f5b6 100644
--- a/test/cases/rlhc.d/case/goto1_c.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/goto1_c.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_c.c-C-T0--var-backend.in b/test/rlhc.d/case/goto1_c.c-C-T0--var-backend.in
index 3004b1ad..3004b1ad 100644
--- a/test/cases/rlhc.d/case/goto1_c.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/goto1_c.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_c.c-C-T1--goto-backend.exp b/test/rlhc.d/case/goto1_c.c-C-T1--goto-backend.exp
index e1a6bcb2..e1a6bcb2 100644
--- a/test/cases/rlhc.d/case/goto1_c.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/goto1_c.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_c.c-C-T1--goto-backend.in b/test/rlhc.d/case/goto1_c.c-C-T1--goto-backend.in
index 996aacbe..996aacbe 100644
--- a/test/cases/rlhc.d/case/goto1_c.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/goto1_c.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_c.c-C-T1--var-backend.exp b/test/rlhc.d/case/goto1_c.c-C-T1--var-backend.exp
index ad8e14cb..ad8e14cb 100644
--- a/test/cases/rlhc.d/case/goto1_c.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/goto1_c.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_c.c-C-T1--var-backend.in b/test/rlhc.d/case/goto1_c.c-C-T1--var-backend.in
index 6fa874ac..6fa874ac 100644
--- a/test/cases/rlhc.d/case/goto1_c.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/goto1_c.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_crack.crk-K-F0--var-backend.exp b/test/rlhc.d/case/goto1_crack.crk-K-F0--var-backend.exp
index d06d3699..d06d3699 100644
--- a/test/cases/rlhc.d/case/goto1_crack.crk-K-F0--var-backend.exp
+++ b/test/rlhc.d/case/goto1_crack.crk-K-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_crack.crk-K-F0--var-backend.in b/test/rlhc.d/case/goto1_crack.crk-K-F0--var-backend.in
index c65972ee..c65972ee 100644
--- a/test/cases/rlhc.d/case/goto1_crack.crk-K-F0--var-backend.in
+++ b/test/rlhc.d/case/goto1_crack.crk-K-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_crack.crk-K-F1--var-backend.exp b/test/rlhc.d/case/goto1_crack.crk-K-F1--var-backend.exp
index acf0d191..acf0d191 100644
--- a/test/cases/rlhc.d/case/goto1_crack.crk-K-F1--var-backend.exp
+++ b/test/rlhc.d/case/goto1_crack.crk-K-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_crack.crk-K-F1--var-backend.in b/test/rlhc.d/case/goto1_crack.crk-K-F1--var-backend.in
index 11cda136..11cda136 100644
--- a/test/cases/rlhc.d/case/goto1_crack.crk-K-F1--var-backend.in
+++ b/test/rlhc.d/case/goto1_crack.crk-K-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_crack.crk-K-T0--var-backend.exp b/test/rlhc.d/case/goto1_crack.crk-K-T0--var-backend.exp
index 90cf903a..90cf903a 100644
--- a/test/cases/rlhc.d/case/goto1_crack.crk-K-T0--var-backend.exp
+++ b/test/rlhc.d/case/goto1_crack.crk-K-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_crack.crk-K-T0--var-backend.in b/test/rlhc.d/case/goto1_crack.crk-K-T0--var-backend.in
index 6eb9c25b..6eb9c25b 100644
--- a/test/cases/rlhc.d/case/goto1_crack.crk-K-T0--var-backend.in
+++ b/test/rlhc.d/case/goto1_crack.crk-K-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_crack.crk-K-T1--var-backend.exp b/test/rlhc.d/case/goto1_crack.crk-K-T1--var-backend.exp
index 342eb7b4..342eb7b4 100644
--- a/test/cases/rlhc.d/case/goto1_crack.crk-K-T1--var-backend.exp
+++ b/test/rlhc.d/case/goto1_crack.crk-K-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_crack.crk-K-T1--var-backend.in b/test/rlhc.d/case/goto1_crack.crk-K-T1--var-backend.in
index d5c3b92d..d5c3b92d 100644
--- a/test/cases/rlhc.d/case/goto1_crack.crk-K-T1--var-backend.in
+++ b/test/rlhc.d/case/goto1_crack.crk-K-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_cs.cs-A-F0--goto-backend.exp b/test/rlhc.d/case/goto1_cs.cs-A-F0--goto-backend.exp
index c8762c66..c8762c66 100644
--- a/test/cases/rlhc.d/case/goto1_cs.cs-A-F0--goto-backend.exp
+++ b/test/rlhc.d/case/goto1_cs.cs-A-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_cs.cs-A-F0--goto-backend.in b/test/rlhc.d/case/goto1_cs.cs-A-F0--goto-backend.in
index d053e703..d053e703 100644
--- a/test/cases/rlhc.d/case/goto1_cs.cs-A-F0--goto-backend.in
+++ b/test/rlhc.d/case/goto1_cs.cs-A-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_cs.cs-A-F0--var-backend.exp b/test/rlhc.d/case/goto1_cs.cs-A-F0--var-backend.exp
index 17d4f4fc..17d4f4fc 100644
--- a/test/cases/rlhc.d/case/goto1_cs.cs-A-F0--var-backend.exp
+++ b/test/rlhc.d/case/goto1_cs.cs-A-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_cs.cs-A-F0--var-backend.in b/test/rlhc.d/case/goto1_cs.cs-A-F0--var-backend.in
index f81208aa..f81208aa 100644
--- a/test/cases/rlhc.d/case/goto1_cs.cs-A-F0--var-backend.in
+++ b/test/rlhc.d/case/goto1_cs.cs-A-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_cs.cs-A-F1--goto-backend.exp b/test/rlhc.d/case/goto1_cs.cs-A-F1--goto-backend.exp
index 82451e96..82451e96 100644
--- a/test/cases/rlhc.d/case/goto1_cs.cs-A-F1--goto-backend.exp
+++ b/test/rlhc.d/case/goto1_cs.cs-A-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_cs.cs-A-F1--goto-backend.in b/test/rlhc.d/case/goto1_cs.cs-A-F1--goto-backend.in
index e1a7a1f2..e1a7a1f2 100644
--- a/test/cases/rlhc.d/case/goto1_cs.cs-A-F1--goto-backend.in
+++ b/test/rlhc.d/case/goto1_cs.cs-A-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_cs.cs-A-F1--var-backend.exp b/test/rlhc.d/case/goto1_cs.cs-A-F1--var-backend.exp
index cfd4433c..cfd4433c 100644
--- a/test/cases/rlhc.d/case/goto1_cs.cs-A-F1--var-backend.exp
+++ b/test/rlhc.d/case/goto1_cs.cs-A-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_cs.cs-A-F1--var-backend.in b/test/rlhc.d/case/goto1_cs.cs-A-F1--var-backend.in
index 9ef2b631..9ef2b631 100644
--- a/test/cases/rlhc.d/case/goto1_cs.cs-A-F1--var-backend.in
+++ b/test/rlhc.d/case/goto1_cs.cs-A-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_cs.cs-A-G0--goto-backend.exp b/test/rlhc.d/case/goto1_cs.cs-A-G0--goto-backend.exp
index ebf048db..ebf048db 100644
--- a/test/cases/rlhc.d/case/goto1_cs.cs-A-G0--goto-backend.exp
+++ b/test/rlhc.d/case/goto1_cs.cs-A-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_cs.cs-A-G0--goto-backend.in b/test/rlhc.d/case/goto1_cs.cs-A-G0--goto-backend.in
index 44e17e16..44e17e16 100644
--- a/test/cases/rlhc.d/case/goto1_cs.cs-A-G0--goto-backend.in
+++ b/test/rlhc.d/case/goto1_cs.cs-A-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_cs.cs-A-G1--goto-backend.exp b/test/rlhc.d/case/goto1_cs.cs-A-G1--goto-backend.exp
index 9bbd6c1d..9bbd6c1d 100644
--- a/test/cases/rlhc.d/case/goto1_cs.cs-A-G1--goto-backend.exp
+++ b/test/rlhc.d/case/goto1_cs.cs-A-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_cs.cs-A-G1--goto-backend.in b/test/rlhc.d/case/goto1_cs.cs-A-G1--goto-backend.in
index ce47df5b..ce47df5b 100644
--- a/test/cases/rlhc.d/case/goto1_cs.cs-A-G1--goto-backend.in
+++ b/test/rlhc.d/case/goto1_cs.cs-A-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_cs.cs-A-T0--goto-backend.exp b/test/rlhc.d/case/goto1_cs.cs-A-T0--goto-backend.exp
index 80bf7335..80bf7335 100644
--- a/test/cases/rlhc.d/case/goto1_cs.cs-A-T0--goto-backend.exp
+++ b/test/rlhc.d/case/goto1_cs.cs-A-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_cs.cs-A-T0--goto-backend.in b/test/rlhc.d/case/goto1_cs.cs-A-T0--goto-backend.in
index 2ee387ce..2ee387ce 100644
--- a/test/cases/rlhc.d/case/goto1_cs.cs-A-T0--goto-backend.in
+++ b/test/rlhc.d/case/goto1_cs.cs-A-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_cs.cs-A-T0--var-backend.exp b/test/rlhc.d/case/goto1_cs.cs-A-T0--var-backend.exp
index 7fdaa9d3..7fdaa9d3 100644
--- a/test/cases/rlhc.d/case/goto1_cs.cs-A-T0--var-backend.exp
+++ b/test/rlhc.d/case/goto1_cs.cs-A-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_cs.cs-A-T0--var-backend.in b/test/rlhc.d/case/goto1_cs.cs-A-T0--var-backend.in
index fef867aa..fef867aa 100644
--- a/test/cases/rlhc.d/case/goto1_cs.cs-A-T0--var-backend.in
+++ b/test/rlhc.d/case/goto1_cs.cs-A-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_cs.cs-A-T1--goto-backend.exp b/test/rlhc.d/case/goto1_cs.cs-A-T1--goto-backend.exp
index a6310a73..a6310a73 100644
--- a/test/cases/rlhc.d/case/goto1_cs.cs-A-T1--goto-backend.exp
+++ b/test/rlhc.d/case/goto1_cs.cs-A-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_cs.cs-A-T1--goto-backend.in b/test/rlhc.d/case/goto1_cs.cs-A-T1--goto-backend.in
index cfa79f95..cfa79f95 100644
--- a/test/cases/rlhc.d/case/goto1_cs.cs-A-T1--goto-backend.in
+++ b/test/rlhc.d/case/goto1_cs.cs-A-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_cs.cs-A-T1--var-backend.exp b/test/rlhc.d/case/goto1_cs.cs-A-T1--var-backend.exp
index caef1159..caef1159 100644
--- a/test/cases/rlhc.d/case/goto1_cs.cs-A-T1--var-backend.exp
+++ b/test/rlhc.d/case/goto1_cs.cs-A-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_cs.cs-A-T1--var-backend.in b/test/rlhc.d/case/goto1_cs.cs-A-T1--var-backend.in
index 3ba23ec7..3ba23ec7 100644
--- a/test/cases/rlhc.d/case/goto1_cs.cs-A-T1--var-backend.in
+++ b/test/rlhc.d/case/goto1_cs.cs-A-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_go.go-Z-F0--goto-backend.exp b/test/rlhc.d/case/goto1_go.go-Z-F0--goto-backend.exp
index f2d52097..f2d52097 100644
--- a/test/cases/rlhc.d/case/goto1_go.go-Z-F0--goto-backend.exp
+++ b/test/rlhc.d/case/goto1_go.go-Z-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_go.go-Z-F0--goto-backend.in b/test/rlhc.d/case/goto1_go.go-Z-F0--goto-backend.in
index 6e495093..6e495093 100644
--- a/test/cases/rlhc.d/case/goto1_go.go-Z-F0--goto-backend.in
+++ b/test/rlhc.d/case/goto1_go.go-Z-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_go.go-Z-F0--var-backend.exp b/test/rlhc.d/case/goto1_go.go-Z-F0--var-backend.exp
index 188e8a71..188e8a71 100644
--- a/test/cases/rlhc.d/case/goto1_go.go-Z-F0--var-backend.exp
+++ b/test/rlhc.d/case/goto1_go.go-Z-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_go.go-Z-F0--var-backend.in b/test/rlhc.d/case/goto1_go.go-Z-F0--var-backend.in
index 954f72b3..954f72b3 100644
--- a/test/cases/rlhc.d/case/goto1_go.go-Z-F0--var-backend.in
+++ b/test/rlhc.d/case/goto1_go.go-Z-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_go.go-Z-F1--goto-backend.exp b/test/rlhc.d/case/goto1_go.go-Z-F1--goto-backend.exp
index 2f80df1c..2f80df1c 100644
--- a/test/cases/rlhc.d/case/goto1_go.go-Z-F1--goto-backend.exp
+++ b/test/rlhc.d/case/goto1_go.go-Z-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_go.go-Z-F1--goto-backend.in b/test/rlhc.d/case/goto1_go.go-Z-F1--goto-backend.in
index fcb7b337..fcb7b337 100644
--- a/test/cases/rlhc.d/case/goto1_go.go-Z-F1--goto-backend.in
+++ b/test/rlhc.d/case/goto1_go.go-Z-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_go.go-Z-F1--var-backend.exp b/test/rlhc.d/case/goto1_go.go-Z-F1--var-backend.exp
index 814be802..814be802 100644
--- a/test/cases/rlhc.d/case/goto1_go.go-Z-F1--var-backend.exp
+++ b/test/rlhc.d/case/goto1_go.go-Z-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_go.go-Z-F1--var-backend.in b/test/rlhc.d/case/goto1_go.go-Z-F1--var-backend.in
index 1ac7caae..1ac7caae 100644
--- a/test/cases/rlhc.d/case/goto1_go.go-Z-F1--var-backend.in
+++ b/test/rlhc.d/case/goto1_go.go-Z-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_go.go-Z-G0--goto-backend.exp b/test/rlhc.d/case/goto1_go.go-Z-G0--goto-backend.exp
index 1b1bb2cd..1b1bb2cd 100644
--- a/test/cases/rlhc.d/case/goto1_go.go-Z-G0--goto-backend.exp
+++ b/test/rlhc.d/case/goto1_go.go-Z-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_go.go-Z-G0--goto-backend.in b/test/rlhc.d/case/goto1_go.go-Z-G0--goto-backend.in
index 2ef430d8..2ef430d8 100644
--- a/test/cases/rlhc.d/case/goto1_go.go-Z-G0--goto-backend.in
+++ b/test/rlhc.d/case/goto1_go.go-Z-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_go.go-Z-G1--goto-backend.exp b/test/rlhc.d/case/goto1_go.go-Z-G1--goto-backend.exp
index 4c4f2788..4c4f2788 100644
--- a/test/cases/rlhc.d/case/goto1_go.go-Z-G1--goto-backend.exp
+++ b/test/rlhc.d/case/goto1_go.go-Z-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_go.go-Z-G1--goto-backend.in b/test/rlhc.d/case/goto1_go.go-Z-G1--goto-backend.in
index 3c4afda0..3c4afda0 100644
--- a/test/cases/rlhc.d/case/goto1_go.go-Z-G1--goto-backend.in
+++ b/test/rlhc.d/case/goto1_go.go-Z-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_go.go-Z-G2--goto-backend.exp b/test/rlhc.d/case/goto1_go.go-Z-G2--goto-backend.exp
index ba10e906..ba10e906 100644
--- a/test/cases/rlhc.d/case/goto1_go.go-Z-G2--goto-backend.exp
+++ b/test/rlhc.d/case/goto1_go.go-Z-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_go.go-Z-G2--goto-backend.in b/test/rlhc.d/case/goto1_go.go-Z-G2--goto-backend.in
index 76a54921..76a54921 100644
--- a/test/cases/rlhc.d/case/goto1_go.go-Z-G2--goto-backend.in
+++ b/test/rlhc.d/case/goto1_go.go-Z-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_go.go-Z-T0--goto-backend.exp b/test/rlhc.d/case/goto1_go.go-Z-T0--goto-backend.exp
index f5a80814..f5a80814 100644
--- a/test/cases/rlhc.d/case/goto1_go.go-Z-T0--goto-backend.exp
+++ b/test/rlhc.d/case/goto1_go.go-Z-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_go.go-Z-T0--goto-backend.in b/test/rlhc.d/case/goto1_go.go-Z-T0--goto-backend.in
index 768e72e0..768e72e0 100644
--- a/test/cases/rlhc.d/case/goto1_go.go-Z-T0--goto-backend.in
+++ b/test/rlhc.d/case/goto1_go.go-Z-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_go.go-Z-T0--var-backend.exp b/test/rlhc.d/case/goto1_go.go-Z-T0--var-backend.exp
index 2a0095fd..2a0095fd 100644
--- a/test/cases/rlhc.d/case/goto1_go.go-Z-T0--var-backend.exp
+++ b/test/rlhc.d/case/goto1_go.go-Z-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_go.go-Z-T0--var-backend.in b/test/rlhc.d/case/goto1_go.go-Z-T0--var-backend.in
index 28c6c8a9..28c6c8a9 100644
--- a/test/cases/rlhc.d/case/goto1_go.go-Z-T0--var-backend.in
+++ b/test/rlhc.d/case/goto1_go.go-Z-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_go.go-Z-T1--goto-backend.exp b/test/rlhc.d/case/goto1_go.go-Z-T1--goto-backend.exp
index 50c893a1..50c893a1 100644
--- a/test/cases/rlhc.d/case/goto1_go.go-Z-T1--goto-backend.exp
+++ b/test/rlhc.d/case/goto1_go.go-Z-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_go.go-Z-T1--goto-backend.in b/test/rlhc.d/case/goto1_go.go-Z-T1--goto-backend.in
index 2813a2f7..2813a2f7 100644
--- a/test/cases/rlhc.d/case/goto1_go.go-Z-T1--goto-backend.in
+++ b/test/rlhc.d/case/goto1_go.go-Z-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_go.go-Z-T1--var-backend.exp b/test/rlhc.d/case/goto1_go.go-Z-T1--var-backend.exp
index 814049de..814049de 100644
--- a/test/cases/rlhc.d/case/goto1_go.go-Z-T1--var-backend.exp
+++ b/test/rlhc.d/case/goto1_go.go-Z-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_go.go-Z-T1--var-backend.in b/test/rlhc.d/case/goto1_go.go-Z-T1--var-backend.in
index 474d0fef..474d0fef 100644
--- a/test/cases/rlhc.d/case/goto1_go.go-Z-T1--var-backend.in
+++ b/test/rlhc.d/case/goto1_go.go-Z-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_java.java-J-F0--goto-backend.exp b/test/rlhc.d/case/goto1_java.java-J-F0--goto-backend.exp
index ae1b5717..ae1b5717 100644
--- a/test/cases/rlhc.d/case/goto1_java.java-J-F0--goto-backend.exp
+++ b/test/rlhc.d/case/goto1_java.java-J-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_java.java-J-F0--goto-backend.in b/test/rlhc.d/case/goto1_java.java-J-F0--goto-backend.in
index 8d70894f..8d70894f 100644
--- a/test/cases/rlhc.d/case/goto1_java.java-J-F0--goto-backend.in
+++ b/test/rlhc.d/case/goto1_java.java-J-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_java.java-J-F0--var-backend.exp b/test/rlhc.d/case/goto1_java.java-J-F0--var-backend.exp
index a70ce6c4..a70ce6c4 100644
--- a/test/cases/rlhc.d/case/goto1_java.java-J-F0--var-backend.exp
+++ b/test/rlhc.d/case/goto1_java.java-J-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_java.java-J-F0--var-backend.in b/test/rlhc.d/case/goto1_java.java-J-F0--var-backend.in
index 0fe08514..0fe08514 100644
--- a/test/cases/rlhc.d/case/goto1_java.java-J-F0--var-backend.in
+++ b/test/rlhc.d/case/goto1_java.java-J-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_java.java-J-F1--goto-backend.exp b/test/rlhc.d/case/goto1_java.java-J-F1--goto-backend.exp
index dc0c4ef8..dc0c4ef8 100644
--- a/test/cases/rlhc.d/case/goto1_java.java-J-F1--goto-backend.exp
+++ b/test/rlhc.d/case/goto1_java.java-J-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_java.java-J-F1--goto-backend.in b/test/rlhc.d/case/goto1_java.java-J-F1--goto-backend.in
index 4d6db64f..4d6db64f 100644
--- a/test/cases/rlhc.d/case/goto1_java.java-J-F1--goto-backend.in
+++ b/test/rlhc.d/case/goto1_java.java-J-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_java.java-J-F1--var-backend.exp b/test/rlhc.d/case/goto1_java.java-J-F1--var-backend.exp
index aeb9f85e..aeb9f85e 100644
--- a/test/cases/rlhc.d/case/goto1_java.java-J-F1--var-backend.exp
+++ b/test/rlhc.d/case/goto1_java.java-J-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_java.java-J-F1--var-backend.in b/test/rlhc.d/case/goto1_java.java-J-F1--var-backend.in
index bb64b836..bb64b836 100644
--- a/test/cases/rlhc.d/case/goto1_java.java-J-F1--var-backend.in
+++ b/test/rlhc.d/case/goto1_java.java-J-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_java.java-J-T0--goto-backend.exp b/test/rlhc.d/case/goto1_java.java-J-T0--goto-backend.exp
index 7a2c7f5a..7a2c7f5a 100644
--- a/test/cases/rlhc.d/case/goto1_java.java-J-T0--goto-backend.exp
+++ b/test/rlhc.d/case/goto1_java.java-J-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_java.java-J-T0--goto-backend.in b/test/rlhc.d/case/goto1_java.java-J-T0--goto-backend.in
index 5d2b18ff..5d2b18ff 100644
--- a/test/cases/rlhc.d/case/goto1_java.java-J-T0--goto-backend.in
+++ b/test/rlhc.d/case/goto1_java.java-J-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_java.java-J-T0--var-backend.exp b/test/rlhc.d/case/goto1_java.java-J-T0--var-backend.exp
index 755a3681..755a3681 100644
--- a/test/cases/rlhc.d/case/goto1_java.java-J-T0--var-backend.exp
+++ b/test/rlhc.d/case/goto1_java.java-J-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_java.java-J-T0--var-backend.in b/test/rlhc.d/case/goto1_java.java-J-T0--var-backend.in
index 5f3d4825..5f3d4825 100644
--- a/test/cases/rlhc.d/case/goto1_java.java-J-T0--var-backend.in
+++ b/test/rlhc.d/case/goto1_java.java-J-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_java.java-J-T1--goto-backend.exp b/test/rlhc.d/case/goto1_java.java-J-T1--goto-backend.exp
index ce5ba8d5..ce5ba8d5 100644
--- a/test/cases/rlhc.d/case/goto1_java.java-J-T1--goto-backend.exp
+++ b/test/rlhc.d/case/goto1_java.java-J-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_java.java-J-T1--goto-backend.in b/test/rlhc.d/case/goto1_java.java-J-T1--goto-backend.in
index 5adeb413..5adeb413 100644
--- a/test/cases/rlhc.d/case/goto1_java.java-J-T1--goto-backend.in
+++ b/test/rlhc.d/case/goto1_java.java-J-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_java.java-J-T1--var-backend.exp b/test/rlhc.d/case/goto1_java.java-J-T1--var-backend.exp
index 8c009d11..8c009d11 100644
--- a/test/cases/rlhc.d/case/goto1_java.java-J-T1--var-backend.exp
+++ b/test/rlhc.d/case/goto1_java.java-J-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_java.java-J-T1--var-backend.in b/test/rlhc.d/case/goto1_java.java-J-T1--var-backend.in
index 49804bc6..49804bc6 100644
--- a/test/cases/rlhc.d/case/goto1_java.java-J-T1--var-backend.in
+++ b/test/rlhc.d/case/goto1_java.java-J-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_julia.jl-Y-F0--var-backend.exp b/test/rlhc.d/case/goto1_julia.jl-Y-F0--var-backend.exp
index 91fb53e7..91fb53e7 100644
--- a/test/cases/rlhc.d/case/goto1_julia.jl-Y-F0--var-backend.exp
+++ b/test/rlhc.d/case/goto1_julia.jl-Y-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_julia.jl-Y-F0--var-backend.in b/test/rlhc.d/case/goto1_julia.jl-Y-F0--var-backend.in
index a4ce9fe0..a4ce9fe0 100644
--- a/test/cases/rlhc.d/case/goto1_julia.jl-Y-F0--var-backend.in
+++ b/test/rlhc.d/case/goto1_julia.jl-Y-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_julia.jl-Y-F1--var-backend.exp b/test/rlhc.d/case/goto1_julia.jl-Y-F1--var-backend.exp
index daad390e..daad390e 100644
--- a/test/cases/rlhc.d/case/goto1_julia.jl-Y-F1--var-backend.exp
+++ b/test/rlhc.d/case/goto1_julia.jl-Y-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_julia.jl-Y-F1--var-backend.in b/test/rlhc.d/case/goto1_julia.jl-Y-F1--var-backend.in
index 71de2933..71de2933 100644
--- a/test/cases/rlhc.d/case/goto1_julia.jl-Y-F1--var-backend.in
+++ b/test/rlhc.d/case/goto1_julia.jl-Y-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_julia.jl-Y-T0--var-backend.exp b/test/rlhc.d/case/goto1_julia.jl-Y-T0--var-backend.exp
index 24e48a0d..24e48a0d 100644
--- a/test/cases/rlhc.d/case/goto1_julia.jl-Y-T0--var-backend.exp
+++ b/test/rlhc.d/case/goto1_julia.jl-Y-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_julia.jl-Y-T0--var-backend.in b/test/rlhc.d/case/goto1_julia.jl-Y-T0--var-backend.in
index e1bd8535..e1bd8535 100644
--- a/test/cases/rlhc.d/case/goto1_julia.jl-Y-T0--var-backend.in
+++ b/test/rlhc.d/case/goto1_julia.jl-Y-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_julia.jl-Y-T1--var-backend.exp b/test/rlhc.d/case/goto1_julia.jl-Y-T1--var-backend.exp
index b4614b8c..b4614b8c 100644
--- a/test/cases/rlhc.d/case/goto1_julia.jl-Y-T1--var-backend.exp
+++ b/test/rlhc.d/case/goto1_julia.jl-Y-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_julia.jl-Y-T1--var-backend.in b/test/rlhc.d/case/goto1_julia.jl-Y-T1--var-backend.in
index 09a826ac..09a826ac 100644
--- a/test/cases/rlhc.d/case/goto1_julia.jl-Y-T1--var-backend.in
+++ b/test/rlhc.d/case/goto1_julia.jl-Y-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_rust.rs-U-F0--var-backend.exp b/test/rlhc.d/case/goto1_rust.rs-U-F0--var-backend.exp
index bc51b958..bc51b958 100644
--- a/test/cases/rlhc.d/case/goto1_rust.rs-U-F0--var-backend.exp
+++ b/test/rlhc.d/case/goto1_rust.rs-U-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_rust.rs-U-F0--var-backend.in b/test/rlhc.d/case/goto1_rust.rs-U-F0--var-backend.in
index f2afef34..f2afef34 100644
--- a/test/cases/rlhc.d/case/goto1_rust.rs-U-F0--var-backend.in
+++ b/test/rlhc.d/case/goto1_rust.rs-U-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_rust.rs-U-F1--var-backend.exp b/test/rlhc.d/case/goto1_rust.rs-U-F1--var-backend.exp
index e4bcc16d..e4bcc16d 100644
--- a/test/cases/rlhc.d/case/goto1_rust.rs-U-F1--var-backend.exp
+++ b/test/rlhc.d/case/goto1_rust.rs-U-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_rust.rs-U-F1--var-backend.in b/test/rlhc.d/case/goto1_rust.rs-U-F1--var-backend.in
index 8725d4f7..8725d4f7 100644
--- a/test/cases/rlhc.d/case/goto1_rust.rs-U-F1--var-backend.in
+++ b/test/rlhc.d/case/goto1_rust.rs-U-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_rust.rs-U-T0--var-backend.exp b/test/rlhc.d/case/goto1_rust.rs-U-T0--var-backend.exp
index e7f4f49e..e7f4f49e 100644
--- a/test/cases/rlhc.d/case/goto1_rust.rs-U-T0--var-backend.exp
+++ b/test/rlhc.d/case/goto1_rust.rs-U-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_rust.rs-U-T0--var-backend.in b/test/rlhc.d/case/goto1_rust.rs-U-T0--var-backend.in
index aa12ab08..aa12ab08 100644
--- a/test/cases/rlhc.d/case/goto1_rust.rs-U-T0--var-backend.in
+++ b/test/rlhc.d/case/goto1_rust.rs-U-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/goto1_rust.rs-U-T1--var-backend.exp b/test/rlhc.d/case/goto1_rust.rs-U-T1--var-backend.exp
index 83534c19..83534c19 100644
--- a/test/cases/rlhc.d/case/goto1_rust.rs-U-T1--var-backend.exp
+++ b/test/rlhc.d/case/goto1_rust.rs-U-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/goto1_rust.rs-U-T1--var-backend.in b/test/rlhc.d/case/goto1_rust.rs-U-T1--var-backend.in
index 5a15a501..5a15a501 100644
--- a/test/cases/rlhc.d/case/goto1_rust.rs-U-T1--var-backend.in
+++ b/test/rlhc.d/case/goto1_rust.rs-U-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret1_c.c-C-F0--goto-backend.exp b/test/rlhc.d/case/gotocallret1_c.c-C-F0--goto-backend.exp
index 4799fd16..4799fd16 100644
--- a/test/cases/rlhc.d/case/gotocallret1_c.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret1_c.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret1_c.c-C-F0--goto-backend.in b/test/rlhc.d/case/gotocallret1_c.c-C-F0--goto-backend.in
index 41c4c1ac..41c4c1ac 100644
--- a/test/cases/rlhc.d/case/gotocallret1_c.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret1_c.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret1_c.c-C-F1--goto-backend.exp b/test/rlhc.d/case/gotocallret1_c.c-C-F1--goto-backend.exp
index bb8140d7..bb8140d7 100644
--- a/test/cases/rlhc.d/case/gotocallret1_c.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret1_c.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret1_c.c-C-F1--goto-backend.in b/test/rlhc.d/case/gotocallret1_c.c-C-F1--goto-backend.in
index 6951f65d..6951f65d 100644
--- a/test/cases/rlhc.d/case/gotocallret1_c.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret1_c.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret1_c.c-C-G0--goto-backend.exp b/test/rlhc.d/case/gotocallret1_c.c-C-G0--goto-backend.exp
index db72b5ea..db72b5ea 100644
--- a/test/cases/rlhc.d/case/gotocallret1_c.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret1_c.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret1_c.c-C-G0--goto-backend.in b/test/rlhc.d/case/gotocallret1_c.c-C-G0--goto-backend.in
index 6fbaa207..6fbaa207 100644
--- a/test/cases/rlhc.d/case/gotocallret1_c.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret1_c.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret1_c.c-C-G1--goto-backend.exp b/test/rlhc.d/case/gotocallret1_c.c-C-G1--goto-backend.exp
index 959858cc..959858cc 100644
--- a/test/cases/rlhc.d/case/gotocallret1_c.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret1_c.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret1_c.c-C-G1--goto-backend.in b/test/rlhc.d/case/gotocallret1_c.c-C-G1--goto-backend.in
index 5f6e9e29..5f6e9e29 100644
--- a/test/cases/rlhc.d/case/gotocallret1_c.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret1_c.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret1_c.c-C-G2--goto-backend.exp b/test/rlhc.d/case/gotocallret1_c.c-C-G2--goto-backend.exp
index c5831aa0..c5831aa0 100644
--- a/test/cases/rlhc.d/case/gotocallret1_c.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret1_c.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret1_c.c-C-G2--goto-backend.in b/test/rlhc.d/case/gotocallret1_c.c-C-G2--goto-backend.in
index b621da61..b621da61 100644
--- a/test/cases/rlhc.d/case/gotocallret1_c.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret1_c.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret1_c.c-C-T0--goto-backend.exp b/test/rlhc.d/case/gotocallret1_c.c-C-T0--goto-backend.exp
index bf068aaf..bf068aaf 100644
--- a/test/cases/rlhc.d/case/gotocallret1_c.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret1_c.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret1_c.c-C-T0--goto-backend.in b/test/rlhc.d/case/gotocallret1_c.c-C-T0--goto-backend.in
index 3a1c23aa..3a1c23aa 100644
--- a/test/cases/rlhc.d/case/gotocallret1_c.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret1_c.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret1_c.c-C-T1--goto-backend.exp b/test/rlhc.d/case/gotocallret1_c.c-C-T1--goto-backend.exp
index 41d7f338..41d7f338 100644
--- a/test/cases/rlhc.d/case/gotocallret1_c.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret1_c.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret1_c.c-C-T1--goto-backend.in b/test/rlhc.d/case/gotocallret1_c.c-C-T1--goto-backend.in
index 1b1005bb..1b1005bb 100644
--- a/test/cases/rlhc.d/case/gotocallret1_c.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret1_c.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret1_cs.cs-A-F0--goto-backend.exp b/test/rlhc.d/case/gotocallret1_cs.cs-A-F0--goto-backend.exp
index 79a8ea5d..79a8ea5d 100644
--- a/test/cases/rlhc.d/case/gotocallret1_cs.cs-A-F0--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret1_cs.cs-A-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret1_cs.cs-A-F0--goto-backend.in b/test/rlhc.d/case/gotocallret1_cs.cs-A-F0--goto-backend.in
index 24e5845a..24e5845a 100644
--- a/test/cases/rlhc.d/case/gotocallret1_cs.cs-A-F0--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret1_cs.cs-A-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret1_cs.cs-A-F1--goto-backend.exp b/test/rlhc.d/case/gotocallret1_cs.cs-A-F1--goto-backend.exp
index b994acbd..b994acbd 100644
--- a/test/cases/rlhc.d/case/gotocallret1_cs.cs-A-F1--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret1_cs.cs-A-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret1_cs.cs-A-F1--goto-backend.in b/test/rlhc.d/case/gotocallret1_cs.cs-A-F1--goto-backend.in
index bc23b4b5..bc23b4b5 100644
--- a/test/cases/rlhc.d/case/gotocallret1_cs.cs-A-F1--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret1_cs.cs-A-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret1_cs.cs-A-G0--goto-backend.exp b/test/rlhc.d/case/gotocallret1_cs.cs-A-G0--goto-backend.exp
index f02872e6..f02872e6 100644
--- a/test/cases/rlhc.d/case/gotocallret1_cs.cs-A-G0--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret1_cs.cs-A-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret1_cs.cs-A-G0--goto-backend.in b/test/rlhc.d/case/gotocallret1_cs.cs-A-G0--goto-backend.in
index 02bf9bfc..02bf9bfc 100644
--- a/test/cases/rlhc.d/case/gotocallret1_cs.cs-A-G0--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret1_cs.cs-A-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret1_cs.cs-A-G1--goto-backend.exp b/test/rlhc.d/case/gotocallret1_cs.cs-A-G1--goto-backend.exp
index 442cf8c6..442cf8c6 100644
--- a/test/cases/rlhc.d/case/gotocallret1_cs.cs-A-G1--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret1_cs.cs-A-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret1_cs.cs-A-G1--goto-backend.in b/test/rlhc.d/case/gotocallret1_cs.cs-A-G1--goto-backend.in
index 2e0d9197..2e0d9197 100644
--- a/test/cases/rlhc.d/case/gotocallret1_cs.cs-A-G1--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret1_cs.cs-A-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret1_cs.cs-A-T0--goto-backend.exp b/test/rlhc.d/case/gotocallret1_cs.cs-A-T0--goto-backend.exp
index 0e0cc729..0e0cc729 100644
--- a/test/cases/rlhc.d/case/gotocallret1_cs.cs-A-T0--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret1_cs.cs-A-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret1_cs.cs-A-T0--goto-backend.in b/test/rlhc.d/case/gotocallret1_cs.cs-A-T0--goto-backend.in
index ee2374b0..ee2374b0 100644
--- a/test/cases/rlhc.d/case/gotocallret1_cs.cs-A-T0--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret1_cs.cs-A-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret1_cs.cs-A-T1--goto-backend.exp b/test/rlhc.d/case/gotocallret1_cs.cs-A-T1--goto-backend.exp
index 3e656b2e..3e656b2e 100644
--- a/test/cases/rlhc.d/case/gotocallret1_cs.cs-A-T1--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret1_cs.cs-A-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret1_cs.cs-A-T1--goto-backend.in b/test/rlhc.d/case/gotocallret1_cs.cs-A-T1--goto-backend.in
index 27f9bd76..27f9bd76 100644
--- a/test/cases/rlhc.d/case/gotocallret1_cs.cs-A-T1--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret1_cs.cs-A-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret1_go.go-Z-F0--goto-backend.exp b/test/rlhc.d/case/gotocallret1_go.go-Z-F0--goto-backend.exp
index 0fda7678..0fda7678 100644
--- a/test/cases/rlhc.d/case/gotocallret1_go.go-Z-F0--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret1_go.go-Z-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret1_go.go-Z-F0--goto-backend.in b/test/rlhc.d/case/gotocallret1_go.go-Z-F0--goto-backend.in
index 86a0d08b..86a0d08b 100644
--- a/test/cases/rlhc.d/case/gotocallret1_go.go-Z-F0--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret1_go.go-Z-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret1_go.go-Z-F1--goto-backend.exp b/test/rlhc.d/case/gotocallret1_go.go-Z-F1--goto-backend.exp
index de745d18..de745d18 100644
--- a/test/cases/rlhc.d/case/gotocallret1_go.go-Z-F1--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret1_go.go-Z-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret1_go.go-Z-F1--goto-backend.in b/test/rlhc.d/case/gotocallret1_go.go-Z-F1--goto-backend.in
index 7efd890b..7efd890b 100644
--- a/test/cases/rlhc.d/case/gotocallret1_go.go-Z-F1--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret1_go.go-Z-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret1_go.go-Z-G0--goto-backend.exp b/test/rlhc.d/case/gotocallret1_go.go-Z-G0--goto-backend.exp
index f5df2155..f5df2155 100644
--- a/test/cases/rlhc.d/case/gotocallret1_go.go-Z-G0--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret1_go.go-Z-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret1_go.go-Z-G0--goto-backend.in b/test/rlhc.d/case/gotocallret1_go.go-Z-G0--goto-backend.in
index ab4a512e..ab4a512e 100644
--- a/test/cases/rlhc.d/case/gotocallret1_go.go-Z-G0--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret1_go.go-Z-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret1_go.go-Z-G1--goto-backend.exp b/test/rlhc.d/case/gotocallret1_go.go-Z-G1--goto-backend.exp
index 13d01e7e..13d01e7e 100644
--- a/test/cases/rlhc.d/case/gotocallret1_go.go-Z-G1--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret1_go.go-Z-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret1_go.go-Z-G1--goto-backend.in b/test/rlhc.d/case/gotocallret1_go.go-Z-G1--goto-backend.in
index 135857d2..135857d2 100644
--- a/test/cases/rlhc.d/case/gotocallret1_go.go-Z-G1--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret1_go.go-Z-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret1_go.go-Z-G2--goto-backend.exp b/test/rlhc.d/case/gotocallret1_go.go-Z-G2--goto-backend.exp
index 471cd0e6..471cd0e6 100644
--- a/test/cases/rlhc.d/case/gotocallret1_go.go-Z-G2--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret1_go.go-Z-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret1_go.go-Z-G2--goto-backend.in b/test/rlhc.d/case/gotocallret1_go.go-Z-G2--goto-backend.in
index 09c0e83f..09c0e83f 100644
--- a/test/cases/rlhc.d/case/gotocallret1_go.go-Z-G2--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret1_go.go-Z-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret1_go.go-Z-T0--goto-backend.exp b/test/rlhc.d/case/gotocallret1_go.go-Z-T0--goto-backend.exp
index 2c1bfd41..2c1bfd41 100644
--- a/test/cases/rlhc.d/case/gotocallret1_go.go-Z-T0--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret1_go.go-Z-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret1_go.go-Z-T0--goto-backend.in b/test/rlhc.d/case/gotocallret1_go.go-Z-T0--goto-backend.in
index 042ef1a2..042ef1a2 100644
--- a/test/cases/rlhc.d/case/gotocallret1_go.go-Z-T0--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret1_go.go-Z-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret1_go.go-Z-T1--goto-backend.exp b/test/rlhc.d/case/gotocallret1_go.go-Z-T1--goto-backend.exp
index 3bd8c8a7..3bd8c8a7 100644
--- a/test/cases/rlhc.d/case/gotocallret1_go.go-Z-T1--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret1_go.go-Z-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret1_go.go-Z-T1--goto-backend.in b/test/rlhc.d/case/gotocallret1_go.go-Z-T1--goto-backend.in
index 5335996b..5335996b 100644
--- a/test/cases/rlhc.d/case/gotocallret1_go.go-Z-T1--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret1_go.go-Z-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret1_java.java-J-F0--goto-backend.exp b/test/rlhc.d/case/gotocallret1_java.java-J-F0--goto-backend.exp
index 706202fd..706202fd 100644
--- a/test/cases/rlhc.d/case/gotocallret1_java.java-J-F0--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret1_java.java-J-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret1_java.java-J-F0--goto-backend.in b/test/rlhc.d/case/gotocallret1_java.java-J-F0--goto-backend.in
index e9077221..e9077221 100644
--- a/test/cases/rlhc.d/case/gotocallret1_java.java-J-F0--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret1_java.java-J-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret1_java.java-J-F1--goto-backend.exp b/test/rlhc.d/case/gotocallret1_java.java-J-F1--goto-backend.exp
index 44bafc63..44bafc63 100644
--- a/test/cases/rlhc.d/case/gotocallret1_java.java-J-F1--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret1_java.java-J-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret1_java.java-J-F1--goto-backend.in b/test/rlhc.d/case/gotocallret1_java.java-J-F1--goto-backend.in
index 3103742c..3103742c 100644
--- a/test/cases/rlhc.d/case/gotocallret1_java.java-J-F1--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret1_java.java-J-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret1_java.java-J-T0--goto-backend.exp b/test/rlhc.d/case/gotocallret1_java.java-J-T0--goto-backend.exp
index fa68036a..fa68036a 100644
--- a/test/cases/rlhc.d/case/gotocallret1_java.java-J-T0--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret1_java.java-J-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret1_java.java-J-T0--goto-backend.in b/test/rlhc.d/case/gotocallret1_java.java-J-T0--goto-backend.in
index fe9d6247..fe9d6247 100644
--- a/test/cases/rlhc.d/case/gotocallret1_java.java-J-T0--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret1_java.java-J-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret1_java.java-J-T1--goto-backend.exp b/test/rlhc.d/case/gotocallret1_java.java-J-T1--goto-backend.exp
index 4d4d507d..4d4d507d 100644
--- a/test/cases/rlhc.d/case/gotocallret1_java.java-J-T1--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret1_java.java-J-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret1_java.java-J-T1--goto-backend.in b/test/rlhc.d/case/gotocallret1_java.java-J-T1--goto-backend.in
index f480b141..f480b141 100644
--- a/test/cases/rlhc.d/case/gotocallret1_java.java-J-T1--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret1_java.java-J-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret2_c.c-C-F0--goto-backend.exp b/test/rlhc.d/case/gotocallret2_c.c-C-F0--goto-backend.exp
index b7424904..b7424904 100644
--- a/test/cases/rlhc.d/case/gotocallret2_c.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret2_c.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret2_c.c-C-F0--goto-backend.in b/test/rlhc.d/case/gotocallret2_c.c-C-F0--goto-backend.in
index bfa79e90..bfa79e90 100644
--- a/test/cases/rlhc.d/case/gotocallret2_c.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret2_c.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret2_c.c-C-F1--goto-backend.exp b/test/rlhc.d/case/gotocallret2_c.c-C-F1--goto-backend.exp
index 3e8b6e71..3e8b6e71 100644
--- a/test/cases/rlhc.d/case/gotocallret2_c.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret2_c.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret2_c.c-C-F1--goto-backend.in b/test/rlhc.d/case/gotocallret2_c.c-C-F1--goto-backend.in
index 7ff161b3..7ff161b3 100644
--- a/test/cases/rlhc.d/case/gotocallret2_c.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret2_c.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret2_c.c-C-G0--goto-backend.exp b/test/rlhc.d/case/gotocallret2_c.c-C-G0--goto-backend.exp
index 2c8b2e04..2c8b2e04 100644
--- a/test/cases/rlhc.d/case/gotocallret2_c.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret2_c.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret2_c.c-C-G0--goto-backend.in b/test/rlhc.d/case/gotocallret2_c.c-C-G0--goto-backend.in
index 0a2f587e..0a2f587e 100644
--- a/test/cases/rlhc.d/case/gotocallret2_c.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret2_c.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret2_c.c-C-G1--goto-backend.exp b/test/rlhc.d/case/gotocallret2_c.c-C-G1--goto-backend.exp
index 40a5b13e..40a5b13e 100644
--- a/test/cases/rlhc.d/case/gotocallret2_c.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret2_c.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret2_c.c-C-G1--goto-backend.in b/test/rlhc.d/case/gotocallret2_c.c-C-G1--goto-backend.in
index 03d1686e..03d1686e 100644
--- a/test/cases/rlhc.d/case/gotocallret2_c.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret2_c.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret2_c.c-C-G2--goto-backend.exp b/test/rlhc.d/case/gotocallret2_c.c-C-G2--goto-backend.exp
index 84f932c7..84f932c7 100644
--- a/test/cases/rlhc.d/case/gotocallret2_c.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret2_c.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret2_c.c-C-G2--goto-backend.in b/test/rlhc.d/case/gotocallret2_c.c-C-G2--goto-backend.in
index d71a516e..d71a516e 100644
--- a/test/cases/rlhc.d/case/gotocallret2_c.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret2_c.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret2_c.c-C-T0--goto-backend.exp b/test/rlhc.d/case/gotocallret2_c.c-C-T0--goto-backend.exp
index 32b5f018..32b5f018 100644
--- a/test/cases/rlhc.d/case/gotocallret2_c.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret2_c.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret2_c.c-C-T0--goto-backend.in b/test/rlhc.d/case/gotocallret2_c.c-C-T0--goto-backend.in
index 7f3e9a83..7f3e9a83 100644
--- a/test/cases/rlhc.d/case/gotocallret2_c.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret2_c.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret2_c.c-C-T1--goto-backend.exp b/test/rlhc.d/case/gotocallret2_c.c-C-T1--goto-backend.exp
index 98d30ab1..98d30ab1 100644
--- a/test/cases/rlhc.d/case/gotocallret2_c.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret2_c.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret2_c.c-C-T1--goto-backend.in b/test/rlhc.d/case/gotocallret2_c.c-C-T1--goto-backend.in
index 67f361b7..67f361b7 100644
--- a/test/cases/rlhc.d/case/gotocallret2_c.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret2_c.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret2_cs.cs-A-F0--goto-backend.exp b/test/rlhc.d/case/gotocallret2_cs.cs-A-F0--goto-backend.exp
index 6c3f6e80..6c3f6e80 100644
--- a/test/cases/rlhc.d/case/gotocallret2_cs.cs-A-F0--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret2_cs.cs-A-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret2_cs.cs-A-F0--goto-backend.in b/test/rlhc.d/case/gotocallret2_cs.cs-A-F0--goto-backend.in
index a6caddf6..a6caddf6 100644
--- a/test/cases/rlhc.d/case/gotocallret2_cs.cs-A-F0--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret2_cs.cs-A-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret2_cs.cs-A-F1--goto-backend.exp b/test/rlhc.d/case/gotocallret2_cs.cs-A-F1--goto-backend.exp
index 82bf8ef1..82bf8ef1 100644
--- a/test/cases/rlhc.d/case/gotocallret2_cs.cs-A-F1--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret2_cs.cs-A-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret2_cs.cs-A-F1--goto-backend.in b/test/rlhc.d/case/gotocallret2_cs.cs-A-F1--goto-backend.in
index b29309a0..b29309a0 100644
--- a/test/cases/rlhc.d/case/gotocallret2_cs.cs-A-F1--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret2_cs.cs-A-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret2_cs.cs-A-G0--goto-backend.exp b/test/rlhc.d/case/gotocallret2_cs.cs-A-G0--goto-backend.exp
index 01372781..01372781 100644
--- a/test/cases/rlhc.d/case/gotocallret2_cs.cs-A-G0--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret2_cs.cs-A-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret2_cs.cs-A-G0--goto-backend.in b/test/rlhc.d/case/gotocallret2_cs.cs-A-G0--goto-backend.in
index 6e4034bf..6e4034bf 100644
--- a/test/cases/rlhc.d/case/gotocallret2_cs.cs-A-G0--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret2_cs.cs-A-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret2_cs.cs-A-G1--goto-backend.exp b/test/rlhc.d/case/gotocallret2_cs.cs-A-G1--goto-backend.exp
index 4c0e00ce..4c0e00ce 100644
--- a/test/cases/rlhc.d/case/gotocallret2_cs.cs-A-G1--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret2_cs.cs-A-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret2_cs.cs-A-G1--goto-backend.in b/test/rlhc.d/case/gotocallret2_cs.cs-A-G1--goto-backend.in
index 5084de92..5084de92 100644
--- a/test/cases/rlhc.d/case/gotocallret2_cs.cs-A-G1--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret2_cs.cs-A-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret2_cs.cs-A-T0--goto-backend.exp b/test/rlhc.d/case/gotocallret2_cs.cs-A-T0--goto-backend.exp
index 1e751a84..1e751a84 100644
--- a/test/cases/rlhc.d/case/gotocallret2_cs.cs-A-T0--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret2_cs.cs-A-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret2_cs.cs-A-T0--goto-backend.in b/test/rlhc.d/case/gotocallret2_cs.cs-A-T0--goto-backend.in
index 6f86d242..6f86d242 100644
--- a/test/cases/rlhc.d/case/gotocallret2_cs.cs-A-T0--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret2_cs.cs-A-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret2_cs.cs-A-T1--goto-backend.exp b/test/rlhc.d/case/gotocallret2_cs.cs-A-T1--goto-backend.exp
index ebc34340..ebc34340 100644
--- a/test/cases/rlhc.d/case/gotocallret2_cs.cs-A-T1--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret2_cs.cs-A-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret2_cs.cs-A-T1--goto-backend.in b/test/rlhc.d/case/gotocallret2_cs.cs-A-T1--goto-backend.in
index f1a3637c..f1a3637c 100644
--- a/test/cases/rlhc.d/case/gotocallret2_cs.cs-A-T1--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret2_cs.cs-A-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret2_go.go-Z-F0--goto-backend.exp b/test/rlhc.d/case/gotocallret2_go.go-Z-F0--goto-backend.exp
index 1ba147b7..1ba147b7 100644
--- a/test/cases/rlhc.d/case/gotocallret2_go.go-Z-F0--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret2_go.go-Z-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret2_go.go-Z-F0--goto-backend.in b/test/rlhc.d/case/gotocallret2_go.go-Z-F0--goto-backend.in
index 335bca6c..335bca6c 100644
--- a/test/cases/rlhc.d/case/gotocallret2_go.go-Z-F0--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret2_go.go-Z-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret2_go.go-Z-F1--goto-backend.exp b/test/rlhc.d/case/gotocallret2_go.go-Z-F1--goto-backend.exp
index 6fa67336..6fa67336 100644
--- a/test/cases/rlhc.d/case/gotocallret2_go.go-Z-F1--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret2_go.go-Z-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret2_go.go-Z-F1--goto-backend.in b/test/rlhc.d/case/gotocallret2_go.go-Z-F1--goto-backend.in
index e3650470..e3650470 100644
--- a/test/cases/rlhc.d/case/gotocallret2_go.go-Z-F1--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret2_go.go-Z-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret2_go.go-Z-G0--goto-backend.exp b/test/rlhc.d/case/gotocallret2_go.go-Z-G0--goto-backend.exp
index b10d467e..b10d467e 100644
--- a/test/cases/rlhc.d/case/gotocallret2_go.go-Z-G0--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret2_go.go-Z-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret2_go.go-Z-G0--goto-backend.in b/test/rlhc.d/case/gotocallret2_go.go-Z-G0--goto-backend.in
index 017f24cd..017f24cd 100644
--- a/test/cases/rlhc.d/case/gotocallret2_go.go-Z-G0--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret2_go.go-Z-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret2_go.go-Z-G1--goto-backend.exp b/test/rlhc.d/case/gotocallret2_go.go-Z-G1--goto-backend.exp
index a310f232..a310f232 100644
--- a/test/cases/rlhc.d/case/gotocallret2_go.go-Z-G1--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret2_go.go-Z-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret2_go.go-Z-G1--goto-backend.in b/test/rlhc.d/case/gotocallret2_go.go-Z-G1--goto-backend.in
index 304d7d17..304d7d17 100644
--- a/test/cases/rlhc.d/case/gotocallret2_go.go-Z-G1--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret2_go.go-Z-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret2_go.go-Z-G2--goto-backend.exp b/test/rlhc.d/case/gotocallret2_go.go-Z-G2--goto-backend.exp
index f3101438..f3101438 100644
--- a/test/cases/rlhc.d/case/gotocallret2_go.go-Z-G2--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret2_go.go-Z-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret2_go.go-Z-G2--goto-backend.in b/test/rlhc.d/case/gotocallret2_go.go-Z-G2--goto-backend.in
index 7f52f4ed..7f52f4ed 100644
--- a/test/cases/rlhc.d/case/gotocallret2_go.go-Z-G2--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret2_go.go-Z-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret2_go.go-Z-T0--goto-backend.exp b/test/rlhc.d/case/gotocallret2_go.go-Z-T0--goto-backend.exp
index f507dfe2..f507dfe2 100644
--- a/test/cases/rlhc.d/case/gotocallret2_go.go-Z-T0--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret2_go.go-Z-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret2_go.go-Z-T0--goto-backend.in b/test/rlhc.d/case/gotocallret2_go.go-Z-T0--goto-backend.in
index 2e1b07e1..2e1b07e1 100644
--- a/test/cases/rlhc.d/case/gotocallret2_go.go-Z-T0--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret2_go.go-Z-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret2_go.go-Z-T1--goto-backend.exp b/test/rlhc.d/case/gotocallret2_go.go-Z-T1--goto-backend.exp
index b0852565..b0852565 100644
--- a/test/cases/rlhc.d/case/gotocallret2_go.go-Z-T1--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret2_go.go-Z-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret2_go.go-Z-T1--goto-backend.in b/test/rlhc.d/case/gotocallret2_go.go-Z-T1--goto-backend.in
index 3c03463c..3c03463c 100644
--- a/test/cases/rlhc.d/case/gotocallret2_go.go-Z-T1--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret2_go.go-Z-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret2_java.java-J-F0--goto-backend.exp b/test/rlhc.d/case/gotocallret2_java.java-J-F0--goto-backend.exp
index 924dd145..924dd145 100644
--- a/test/cases/rlhc.d/case/gotocallret2_java.java-J-F0--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret2_java.java-J-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret2_java.java-J-F0--goto-backend.in b/test/rlhc.d/case/gotocallret2_java.java-J-F0--goto-backend.in
index c2e71d27..c2e71d27 100644
--- a/test/cases/rlhc.d/case/gotocallret2_java.java-J-F0--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret2_java.java-J-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret2_java.java-J-F1--goto-backend.exp b/test/rlhc.d/case/gotocallret2_java.java-J-F1--goto-backend.exp
index 4126af01..4126af01 100644
--- a/test/cases/rlhc.d/case/gotocallret2_java.java-J-F1--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret2_java.java-J-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret2_java.java-J-F1--goto-backend.in b/test/rlhc.d/case/gotocallret2_java.java-J-F1--goto-backend.in
index ba02baf9..ba02baf9 100644
--- a/test/cases/rlhc.d/case/gotocallret2_java.java-J-F1--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret2_java.java-J-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret2_java.java-J-T0--goto-backend.exp b/test/rlhc.d/case/gotocallret2_java.java-J-T0--goto-backend.exp
index bb70c1a2..bb70c1a2 100644
--- a/test/cases/rlhc.d/case/gotocallret2_java.java-J-T0--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret2_java.java-J-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret2_java.java-J-T0--goto-backend.in b/test/rlhc.d/case/gotocallret2_java.java-J-T0--goto-backend.in
index 6f5d6429..6f5d6429 100644
--- a/test/cases/rlhc.d/case/gotocallret2_java.java-J-T0--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret2_java.java-J-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret2_java.java-J-T1--goto-backend.exp b/test/rlhc.d/case/gotocallret2_java.java-J-T1--goto-backend.exp
index 1854aaa1..1854aaa1 100644
--- a/test/cases/rlhc.d/case/gotocallret2_java.java-J-T1--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret2_java.java-J-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret2_java.java-J-T1--goto-backend.in b/test/rlhc.d/case/gotocallret2_java.java-J-T1--goto-backend.in
index 9fac2465..9fac2465 100644
--- a/test/cases/rlhc.d/case/gotocallret2_java.java-J-T1--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret2_java.java-J-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_c.c-C-F0--goto-backend.exp b/test/rlhc.d/case/gotocallret3_c.c-C-F0--goto-backend.exp
index 9dac2d35..9dac2d35 100644
--- a/test/cases/rlhc.d/case/gotocallret3_c.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_c.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_c.c-C-F0--goto-backend.in b/test/rlhc.d/case/gotocallret3_c.c-C-F0--goto-backend.in
index 6c7740e3..6c7740e3 100644
--- a/test/cases/rlhc.d/case/gotocallret3_c.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret3_c.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_c.c-C-F0--var-backend.exp b/test/rlhc.d/case/gotocallret3_c.c-C-F0--var-backend.exp
index 911adb10..911adb10 100644
--- a/test/cases/rlhc.d/case/gotocallret3_c.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_c.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_c.c-C-F0--var-backend.in b/test/rlhc.d/case/gotocallret3_c.c-C-F0--var-backend.in
index 54f9a0ab..54f9a0ab 100644
--- a/test/cases/rlhc.d/case/gotocallret3_c.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/gotocallret3_c.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_c.c-C-F1--goto-backend.exp b/test/rlhc.d/case/gotocallret3_c.c-C-F1--goto-backend.exp
index 4c4fdb74..4c4fdb74 100644
--- a/test/cases/rlhc.d/case/gotocallret3_c.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_c.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_c.c-C-F1--goto-backend.in b/test/rlhc.d/case/gotocallret3_c.c-C-F1--goto-backend.in
index 481026a3..481026a3 100644
--- a/test/cases/rlhc.d/case/gotocallret3_c.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret3_c.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_c.c-C-F1--var-backend.exp b/test/rlhc.d/case/gotocallret3_c.c-C-F1--var-backend.exp
index 6b7386bd..6b7386bd 100644
--- a/test/cases/rlhc.d/case/gotocallret3_c.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_c.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_c.c-C-F1--var-backend.in b/test/rlhc.d/case/gotocallret3_c.c-C-F1--var-backend.in
index 83cb404c..83cb404c 100644
--- a/test/cases/rlhc.d/case/gotocallret3_c.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/gotocallret3_c.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_c.c-C-G0--goto-backend.exp b/test/rlhc.d/case/gotocallret3_c.c-C-G0--goto-backend.exp
index 54dbfed5..54dbfed5 100644
--- a/test/cases/rlhc.d/case/gotocallret3_c.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_c.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_c.c-C-G0--goto-backend.in b/test/rlhc.d/case/gotocallret3_c.c-C-G0--goto-backend.in
index 76145f3a..76145f3a 100644
--- a/test/cases/rlhc.d/case/gotocallret3_c.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret3_c.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_c.c-C-G1--goto-backend.exp b/test/rlhc.d/case/gotocallret3_c.c-C-G1--goto-backend.exp
index 9d31740d..9d31740d 100644
--- a/test/cases/rlhc.d/case/gotocallret3_c.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_c.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_c.c-C-G1--goto-backend.in b/test/rlhc.d/case/gotocallret3_c.c-C-G1--goto-backend.in
index d0787e81..d0787e81 100644
--- a/test/cases/rlhc.d/case/gotocallret3_c.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret3_c.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_c.c-C-G2--goto-backend.exp b/test/rlhc.d/case/gotocallret3_c.c-C-G2--goto-backend.exp
index 06d9c357..06d9c357 100644
--- a/test/cases/rlhc.d/case/gotocallret3_c.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_c.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_c.c-C-G2--goto-backend.in b/test/rlhc.d/case/gotocallret3_c.c-C-G2--goto-backend.in
index 6b835618..6b835618 100644
--- a/test/cases/rlhc.d/case/gotocallret3_c.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret3_c.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_c.c-C-T0--goto-backend.exp b/test/rlhc.d/case/gotocallret3_c.c-C-T0--goto-backend.exp
index 3df10749..3df10749 100644
--- a/test/cases/rlhc.d/case/gotocallret3_c.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_c.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_c.c-C-T0--goto-backend.in b/test/rlhc.d/case/gotocallret3_c.c-C-T0--goto-backend.in
index 3acc0e1f..3acc0e1f 100644
--- a/test/cases/rlhc.d/case/gotocallret3_c.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret3_c.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_c.c-C-T0--var-backend.exp b/test/rlhc.d/case/gotocallret3_c.c-C-T0--var-backend.exp
index e5b559dd..e5b559dd 100644
--- a/test/cases/rlhc.d/case/gotocallret3_c.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_c.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_c.c-C-T0--var-backend.in b/test/rlhc.d/case/gotocallret3_c.c-C-T0--var-backend.in
index 126481d3..126481d3 100644
--- a/test/cases/rlhc.d/case/gotocallret3_c.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/gotocallret3_c.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_c.c-C-T1--goto-backend.exp b/test/rlhc.d/case/gotocallret3_c.c-C-T1--goto-backend.exp
index 3c7c499b..3c7c499b 100644
--- a/test/cases/rlhc.d/case/gotocallret3_c.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_c.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_c.c-C-T1--goto-backend.in b/test/rlhc.d/case/gotocallret3_c.c-C-T1--goto-backend.in
index 26584b7e..26584b7e 100644
--- a/test/cases/rlhc.d/case/gotocallret3_c.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret3_c.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_c.c-C-T1--var-backend.exp b/test/rlhc.d/case/gotocallret3_c.c-C-T1--var-backend.exp
index 95486298..95486298 100644
--- a/test/cases/rlhc.d/case/gotocallret3_c.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_c.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_c.c-C-T1--var-backend.in b/test/rlhc.d/case/gotocallret3_c.c-C-T1--var-backend.in
index f123a158..f123a158 100644
--- a/test/cases/rlhc.d/case/gotocallret3_c.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/gotocallret3_c.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_crack.crk-K-F0--var-backend.exp b/test/rlhc.d/case/gotocallret3_crack.crk-K-F0--var-backend.exp
index 30ab2aa4..30ab2aa4 100644
--- a/test/cases/rlhc.d/case/gotocallret3_crack.crk-K-F0--var-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_crack.crk-K-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_crack.crk-K-F0--var-backend.in b/test/rlhc.d/case/gotocallret3_crack.crk-K-F0--var-backend.in
index 15c6d31e..15c6d31e 100644
--- a/test/cases/rlhc.d/case/gotocallret3_crack.crk-K-F0--var-backend.in
+++ b/test/rlhc.d/case/gotocallret3_crack.crk-K-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_crack.crk-K-F1--var-backend.exp b/test/rlhc.d/case/gotocallret3_crack.crk-K-F1--var-backend.exp
index eb5fb20d..eb5fb20d 100644
--- a/test/cases/rlhc.d/case/gotocallret3_crack.crk-K-F1--var-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_crack.crk-K-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_crack.crk-K-F1--var-backend.in b/test/rlhc.d/case/gotocallret3_crack.crk-K-F1--var-backend.in
index bd78e891..bd78e891 100644
--- a/test/cases/rlhc.d/case/gotocallret3_crack.crk-K-F1--var-backend.in
+++ b/test/rlhc.d/case/gotocallret3_crack.crk-K-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_crack.crk-K-T0--var-backend.exp b/test/rlhc.d/case/gotocallret3_crack.crk-K-T0--var-backend.exp
index 5a6a203c..5a6a203c 100644
--- a/test/cases/rlhc.d/case/gotocallret3_crack.crk-K-T0--var-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_crack.crk-K-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_crack.crk-K-T0--var-backend.in b/test/rlhc.d/case/gotocallret3_crack.crk-K-T0--var-backend.in
index 3064ff63..3064ff63 100644
--- a/test/cases/rlhc.d/case/gotocallret3_crack.crk-K-T0--var-backend.in
+++ b/test/rlhc.d/case/gotocallret3_crack.crk-K-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_crack.crk-K-T1--var-backend.exp b/test/rlhc.d/case/gotocallret3_crack.crk-K-T1--var-backend.exp
index 5e76c781..5e76c781 100644
--- a/test/cases/rlhc.d/case/gotocallret3_crack.crk-K-T1--var-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_crack.crk-K-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_crack.crk-K-T1--var-backend.in b/test/rlhc.d/case/gotocallret3_crack.crk-K-T1--var-backend.in
index a813008b..a813008b 100644
--- a/test/cases/rlhc.d/case/gotocallret3_crack.crk-K-T1--var-backend.in
+++ b/test/rlhc.d/case/gotocallret3_crack.crk-K-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_cs.cs-A-F0--goto-backend.exp b/test/rlhc.d/case/gotocallret3_cs.cs-A-F0--goto-backend.exp
index 5b51e036..5b51e036 100644
--- a/test/cases/rlhc.d/case/gotocallret3_cs.cs-A-F0--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_cs.cs-A-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_cs.cs-A-F0--goto-backend.in b/test/rlhc.d/case/gotocallret3_cs.cs-A-F0--goto-backend.in
index 7da69c3e..7da69c3e 100644
--- a/test/cases/rlhc.d/case/gotocallret3_cs.cs-A-F0--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret3_cs.cs-A-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_cs.cs-A-F0--var-backend.exp b/test/rlhc.d/case/gotocallret3_cs.cs-A-F0--var-backend.exp
index 965414f6..965414f6 100644
--- a/test/cases/rlhc.d/case/gotocallret3_cs.cs-A-F0--var-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_cs.cs-A-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_cs.cs-A-F0--var-backend.in b/test/rlhc.d/case/gotocallret3_cs.cs-A-F0--var-backend.in
index 57822cbd..57822cbd 100644
--- a/test/cases/rlhc.d/case/gotocallret3_cs.cs-A-F0--var-backend.in
+++ b/test/rlhc.d/case/gotocallret3_cs.cs-A-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_cs.cs-A-F1--goto-backend.exp b/test/rlhc.d/case/gotocallret3_cs.cs-A-F1--goto-backend.exp
index 82469acb..82469acb 100644
--- a/test/cases/rlhc.d/case/gotocallret3_cs.cs-A-F1--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_cs.cs-A-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_cs.cs-A-F1--goto-backend.in b/test/rlhc.d/case/gotocallret3_cs.cs-A-F1--goto-backend.in
index d63fe24b..d63fe24b 100644
--- a/test/cases/rlhc.d/case/gotocallret3_cs.cs-A-F1--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret3_cs.cs-A-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_cs.cs-A-F1--var-backend.exp b/test/rlhc.d/case/gotocallret3_cs.cs-A-F1--var-backend.exp
index 6fcde0b8..6fcde0b8 100644
--- a/test/cases/rlhc.d/case/gotocallret3_cs.cs-A-F1--var-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_cs.cs-A-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_cs.cs-A-F1--var-backend.in b/test/rlhc.d/case/gotocallret3_cs.cs-A-F1--var-backend.in
index a564aca7..a564aca7 100644
--- a/test/cases/rlhc.d/case/gotocallret3_cs.cs-A-F1--var-backend.in
+++ b/test/rlhc.d/case/gotocallret3_cs.cs-A-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_cs.cs-A-G0--goto-backend.exp b/test/rlhc.d/case/gotocallret3_cs.cs-A-G0--goto-backend.exp
index e1a9a9a1..e1a9a9a1 100644
--- a/test/cases/rlhc.d/case/gotocallret3_cs.cs-A-G0--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_cs.cs-A-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_cs.cs-A-G0--goto-backend.in b/test/rlhc.d/case/gotocallret3_cs.cs-A-G0--goto-backend.in
index 3abc3b9a..3abc3b9a 100644
--- a/test/cases/rlhc.d/case/gotocallret3_cs.cs-A-G0--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret3_cs.cs-A-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_cs.cs-A-G1--goto-backend.exp b/test/rlhc.d/case/gotocallret3_cs.cs-A-G1--goto-backend.exp
index df1154e6..df1154e6 100644
--- a/test/cases/rlhc.d/case/gotocallret3_cs.cs-A-G1--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_cs.cs-A-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_cs.cs-A-G1--goto-backend.in b/test/rlhc.d/case/gotocallret3_cs.cs-A-G1--goto-backend.in
index 5a9320c6..5a9320c6 100644
--- a/test/cases/rlhc.d/case/gotocallret3_cs.cs-A-G1--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret3_cs.cs-A-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_cs.cs-A-T0--goto-backend.exp b/test/rlhc.d/case/gotocallret3_cs.cs-A-T0--goto-backend.exp
index 47b2f61b..47b2f61b 100644
--- a/test/cases/rlhc.d/case/gotocallret3_cs.cs-A-T0--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_cs.cs-A-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_cs.cs-A-T0--goto-backend.in b/test/rlhc.d/case/gotocallret3_cs.cs-A-T0--goto-backend.in
index 7e1c4531..7e1c4531 100644
--- a/test/cases/rlhc.d/case/gotocallret3_cs.cs-A-T0--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret3_cs.cs-A-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_cs.cs-A-T0--var-backend.exp b/test/rlhc.d/case/gotocallret3_cs.cs-A-T0--var-backend.exp
index 90ba2382..90ba2382 100644
--- a/test/cases/rlhc.d/case/gotocallret3_cs.cs-A-T0--var-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_cs.cs-A-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_cs.cs-A-T0--var-backend.in b/test/rlhc.d/case/gotocallret3_cs.cs-A-T0--var-backend.in
index 2da504a7..2da504a7 100644
--- a/test/cases/rlhc.d/case/gotocallret3_cs.cs-A-T0--var-backend.in
+++ b/test/rlhc.d/case/gotocallret3_cs.cs-A-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_cs.cs-A-T1--goto-backend.exp b/test/rlhc.d/case/gotocallret3_cs.cs-A-T1--goto-backend.exp
index 1f1e25ef..1f1e25ef 100644
--- a/test/cases/rlhc.d/case/gotocallret3_cs.cs-A-T1--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_cs.cs-A-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_cs.cs-A-T1--goto-backend.in b/test/rlhc.d/case/gotocallret3_cs.cs-A-T1--goto-backend.in
index 00bd8ab0..00bd8ab0 100644
--- a/test/cases/rlhc.d/case/gotocallret3_cs.cs-A-T1--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret3_cs.cs-A-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_cs.cs-A-T1--var-backend.exp b/test/rlhc.d/case/gotocallret3_cs.cs-A-T1--var-backend.exp
index 7be6821a..7be6821a 100644
--- a/test/cases/rlhc.d/case/gotocallret3_cs.cs-A-T1--var-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_cs.cs-A-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_cs.cs-A-T1--var-backend.in b/test/rlhc.d/case/gotocallret3_cs.cs-A-T1--var-backend.in
index d4239bb3..d4239bb3 100644
--- a/test/cases/rlhc.d/case/gotocallret3_cs.cs-A-T1--var-backend.in
+++ b/test/rlhc.d/case/gotocallret3_cs.cs-A-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-F0--goto-backend.exp b/test/rlhc.d/case/gotocallret3_go.go-Z-F0--goto-backend.exp
index 940e137d..940e137d 100644
--- a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-F0--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_go.go-Z-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-F0--goto-backend.in b/test/rlhc.d/case/gotocallret3_go.go-Z-F0--goto-backend.in
index ec618294..ec618294 100644
--- a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-F0--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret3_go.go-Z-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-F0--var-backend.exp b/test/rlhc.d/case/gotocallret3_go.go-Z-F0--var-backend.exp
index 5371d543..5371d543 100644
--- a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-F0--var-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_go.go-Z-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-F0--var-backend.in b/test/rlhc.d/case/gotocallret3_go.go-Z-F0--var-backend.in
index 6928ef30..6928ef30 100644
--- a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-F0--var-backend.in
+++ b/test/rlhc.d/case/gotocallret3_go.go-Z-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-F1--goto-backend.exp b/test/rlhc.d/case/gotocallret3_go.go-Z-F1--goto-backend.exp
index fd3a4861..fd3a4861 100644
--- a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-F1--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_go.go-Z-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-F1--goto-backend.in b/test/rlhc.d/case/gotocallret3_go.go-Z-F1--goto-backend.in
index ad161daa..ad161daa 100644
--- a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-F1--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret3_go.go-Z-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-F1--var-backend.exp b/test/rlhc.d/case/gotocallret3_go.go-Z-F1--var-backend.exp
index d69b65e6..d69b65e6 100644
--- a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-F1--var-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_go.go-Z-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-F1--var-backend.in b/test/rlhc.d/case/gotocallret3_go.go-Z-F1--var-backend.in
index 33f752d8..33f752d8 100644
--- a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-F1--var-backend.in
+++ b/test/rlhc.d/case/gotocallret3_go.go-Z-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-G0--goto-backend.exp b/test/rlhc.d/case/gotocallret3_go.go-Z-G0--goto-backend.exp
index b7b0ab8f..b7b0ab8f 100644
--- a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-G0--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_go.go-Z-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-G0--goto-backend.in b/test/rlhc.d/case/gotocallret3_go.go-Z-G0--goto-backend.in
index 453f897b..453f897b 100644
--- a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-G0--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret3_go.go-Z-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-G1--goto-backend.exp b/test/rlhc.d/case/gotocallret3_go.go-Z-G1--goto-backend.exp
index f3109557..f3109557 100644
--- a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-G1--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_go.go-Z-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-G1--goto-backend.in b/test/rlhc.d/case/gotocallret3_go.go-Z-G1--goto-backend.in
index 323fa6d2..323fa6d2 100644
--- a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-G1--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret3_go.go-Z-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-G2--goto-backend.exp b/test/rlhc.d/case/gotocallret3_go.go-Z-G2--goto-backend.exp
index 21efa744..21efa744 100644
--- a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-G2--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_go.go-Z-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-G2--goto-backend.in b/test/rlhc.d/case/gotocallret3_go.go-Z-G2--goto-backend.in
index 3d0619bb..3d0619bb 100644
--- a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-G2--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret3_go.go-Z-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-T0--goto-backend.exp b/test/rlhc.d/case/gotocallret3_go.go-Z-T0--goto-backend.exp
index 3ee2e2b0..3ee2e2b0 100644
--- a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-T0--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_go.go-Z-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-T0--goto-backend.in b/test/rlhc.d/case/gotocallret3_go.go-Z-T0--goto-backend.in
index 5132fdb5..5132fdb5 100644
--- a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-T0--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret3_go.go-Z-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-T0--var-backend.exp b/test/rlhc.d/case/gotocallret3_go.go-Z-T0--var-backend.exp
index 379f2ab8..379f2ab8 100644
--- a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-T0--var-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_go.go-Z-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-T0--var-backend.in b/test/rlhc.d/case/gotocallret3_go.go-Z-T0--var-backend.in
index b7bea803..b7bea803 100644
--- a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-T0--var-backend.in
+++ b/test/rlhc.d/case/gotocallret3_go.go-Z-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-T1--goto-backend.exp b/test/rlhc.d/case/gotocallret3_go.go-Z-T1--goto-backend.exp
index 795e9132..795e9132 100644
--- a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-T1--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_go.go-Z-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-T1--goto-backend.in b/test/rlhc.d/case/gotocallret3_go.go-Z-T1--goto-backend.in
index c85779fa..c85779fa 100644
--- a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-T1--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret3_go.go-Z-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-T1--var-backend.exp b/test/rlhc.d/case/gotocallret3_go.go-Z-T1--var-backend.exp
index 08ad29be..08ad29be 100644
--- a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-T1--var-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_go.go-Z-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-T1--var-backend.in b/test/rlhc.d/case/gotocallret3_go.go-Z-T1--var-backend.in
index fbbd6941..fbbd6941 100644
--- a/test/cases/rlhc.d/case/gotocallret3_go.go-Z-T1--var-backend.in
+++ b/test/rlhc.d/case/gotocallret3_go.go-Z-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_java.java-J-F0--goto-backend.exp b/test/rlhc.d/case/gotocallret3_java.java-J-F0--goto-backend.exp
index 4fc4d960..4fc4d960 100644
--- a/test/cases/rlhc.d/case/gotocallret3_java.java-J-F0--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_java.java-J-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_java.java-J-F0--goto-backend.in b/test/rlhc.d/case/gotocallret3_java.java-J-F0--goto-backend.in
index e08f6347..e08f6347 100644
--- a/test/cases/rlhc.d/case/gotocallret3_java.java-J-F0--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret3_java.java-J-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_java.java-J-F0--var-backend.exp b/test/rlhc.d/case/gotocallret3_java.java-J-F0--var-backend.exp
index e7fd3643..e7fd3643 100644
--- a/test/cases/rlhc.d/case/gotocallret3_java.java-J-F0--var-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_java.java-J-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_java.java-J-F0--var-backend.in b/test/rlhc.d/case/gotocallret3_java.java-J-F0--var-backend.in
index 7fd34e61..7fd34e61 100644
--- a/test/cases/rlhc.d/case/gotocallret3_java.java-J-F0--var-backend.in
+++ b/test/rlhc.d/case/gotocallret3_java.java-J-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_java.java-J-F1--goto-backend.exp b/test/rlhc.d/case/gotocallret3_java.java-J-F1--goto-backend.exp
index b4352a0c..b4352a0c 100644
--- a/test/cases/rlhc.d/case/gotocallret3_java.java-J-F1--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_java.java-J-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_java.java-J-F1--goto-backend.in b/test/rlhc.d/case/gotocallret3_java.java-J-F1--goto-backend.in
index d0218285..d0218285 100644
--- a/test/cases/rlhc.d/case/gotocallret3_java.java-J-F1--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret3_java.java-J-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_java.java-J-F1--var-backend.exp b/test/rlhc.d/case/gotocallret3_java.java-J-F1--var-backend.exp
index 044bb7b0..044bb7b0 100644
--- a/test/cases/rlhc.d/case/gotocallret3_java.java-J-F1--var-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_java.java-J-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_java.java-J-F1--var-backend.in b/test/rlhc.d/case/gotocallret3_java.java-J-F1--var-backend.in
index dbf7c041..dbf7c041 100644
--- a/test/cases/rlhc.d/case/gotocallret3_java.java-J-F1--var-backend.in
+++ b/test/rlhc.d/case/gotocallret3_java.java-J-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_java.java-J-T0--goto-backend.exp b/test/rlhc.d/case/gotocallret3_java.java-J-T0--goto-backend.exp
index c418f0fc..c418f0fc 100644
--- a/test/cases/rlhc.d/case/gotocallret3_java.java-J-T0--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_java.java-J-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_java.java-J-T0--goto-backend.in b/test/rlhc.d/case/gotocallret3_java.java-J-T0--goto-backend.in
index 5057c7a1..5057c7a1 100644
--- a/test/cases/rlhc.d/case/gotocallret3_java.java-J-T0--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret3_java.java-J-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_java.java-J-T0--var-backend.exp b/test/rlhc.d/case/gotocallret3_java.java-J-T0--var-backend.exp
index c0bb885e..c0bb885e 100644
--- a/test/cases/rlhc.d/case/gotocallret3_java.java-J-T0--var-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_java.java-J-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_java.java-J-T0--var-backend.in b/test/rlhc.d/case/gotocallret3_java.java-J-T0--var-backend.in
index 46ae704f..46ae704f 100644
--- a/test/cases/rlhc.d/case/gotocallret3_java.java-J-T0--var-backend.in
+++ b/test/rlhc.d/case/gotocallret3_java.java-J-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_java.java-J-T1--goto-backend.exp b/test/rlhc.d/case/gotocallret3_java.java-J-T1--goto-backend.exp
index 16af5d0c..16af5d0c 100644
--- a/test/cases/rlhc.d/case/gotocallret3_java.java-J-T1--goto-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_java.java-J-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_java.java-J-T1--goto-backend.in b/test/rlhc.d/case/gotocallret3_java.java-J-T1--goto-backend.in
index d66db7ae..d66db7ae 100644
--- a/test/cases/rlhc.d/case/gotocallret3_java.java-J-T1--goto-backend.in
+++ b/test/rlhc.d/case/gotocallret3_java.java-J-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_java.java-J-T1--var-backend.exp b/test/rlhc.d/case/gotocallret3_java.java-J-T1--var-backend.exp
index 62af93d9..62af93d9 100644
--- a/test/cases/rlhc.d/case/gotocallret3_java.java-J-T1--var-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_java.java-J-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_java.java-J-T1--var-backend.in b/test/rlhc.d/case/gotocallret3_java.java-J-T1--var-backend.in
index 6d1a1485..6d1a1485 100644
--- a/test/cases/rlhc.d/case/gotocallret3_java.java-J-T1--var-backend.in
+++ b/test/rlhc.d/case/gotocallret3_java.java-J-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_julia.jl-Y-F0--var-backend.exp b/test/rlhc.d/case/gotocallret3_julia.jl-Y-F0--var-backend.exp
index 346c3899..346c3899 100644
--- a/test/cases/rlhc.d/case/gotocallret3_julia.jl-Y-F0--var-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_julia.jl-Y-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_julia.jl-Y-F0--var-backend.in b/test/rlhc.d/case/gotocallret3_julia.jl-Y-F0--var-backend.in
index ef1b5ce8..ef1b5ce8 100644
--- a/test/cases/rlhc.d/case/gotocallret3_julia.jl-Y-F0--var-backend.in
+++ b/test/rlhc.d/case/gotocallret3_julia.jl-Y-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_julia.jl-Y-F1--var-backend.exp b/test/rlhc.d/case/gotocallret3_julia.jl-Y-F1--var-backend.exp
index 51e6cd8a..51e6cd8a 100644
--- a/test/cases/rlhc.d/case/gotocallret3_julia.jl-Y-F1--var-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_julia.jl-Y-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_julia.jl-Y-F1--var-backend.in b/test/rlhc.d/case/gotocallret3_julia.jl-Y-F1--var-backend.in
index 13de2e83..13de2e83 100644
--- a/test/cases/rlhc.d/case/gotocallret3_julia.jl-Y-F1--var-backend.in
+++ b/test/rlhc.d/case/gotocallret3_julia.jl-Y-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_julia.jl-Y-T0--var-backend.exp b/test/rlhc.d/case/gotocallret3_julia.jl-Y-T0--var-backend.exp
index f3cd39bc..f3cd39bc 100644
--- a/test/cases/rlhc.d/case/gotocallret3_julia.jl-Y-T0--var-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_julia.jl-Y-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_julia.jl-Y-T0--var-backend.in b/test/rlhc.d/case/gotocallret3_julia.jl-Y-T0--var-backend.in
index fda5e072..fda5e072 100644
--- a/test/cases/rlhc.d/case/gotocallret3_julia.jl-Y-T0--var-backend.in
+++ b/test/rlhc.d/case/gotocallret3_julia.jl-Y-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_julia.jl-Y-T1--var-backend.exp b/test/rlhc.d/case/gotocallret3_julia.jl-Y-T1--var-backend.exp
index c46c03d9..c46c03d9 100644
--- a/test/cases/rlhc.d/case/gotocallret3_julia.jl-Y-T1--var-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_julia.jl-Y-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_julia.jl-Y-T1--var-backend.in b/test/rlhc.d/case/gotocallret3_julia.jl-Y-T1--var-backend.in
index 3f8c2f3c..3f8c2f3c 100644
--- a/test/cases/rlhc.d/case/gotocallret3_julia.jl-Y-T1--var-backend.in
+++ b/test/rlhc.d/case/gotocallret3_julia.jl-Y-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_ocaml.ml-O-F0--var-backend.exp b/test/rlhc.d/case/gotocallret3_ocaml.ml-O-F0--var-backend.exp
index da6a03be..da6a03be 100644
--- a/test/cases/rlhc.d/case/gotocallret3_ocaml.ml-O-F0--var-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_ocaml.ml-O-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_ocaml.ml-O-F0--var-backend.in b/test/rlhc.d/case/gotocallret3_ocaml.ml-O-F0--var-backend.in
index 7138370d..7138370d 100644
--- a/test/cases/rlhc.d/case/gotocallret3_ocaml.ml-O-F0--var-backend.in
+++ b/test/rlhc.d/case/gotocallret3_ocaml.ml-O-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_ocaml.ml-O-F1--var-backend.exp b/test/rlhc.d/case/gotocallret3_ocaml.ml-O-F1--var-backend.exp
index bd7f1bd1..bd7f1bd1 100644
--- a/test/cases/rlhc.d/case/gotocallret3_ocaml.ml-O-F1--var-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_ocaml.ml-O-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_ocaml.ml-O-F1--var-backend.in b/test/rlhc.d/case/gotocallret3_ocaml.ml-O-F1--var-backend.in
index a245025f..a245025f 100644
--- a/test/cases/rlhc.d/case/gotocallret3_ocaml.ml-O-F1--var-backend.in
+++ b/test/rlhc.d/case/gotocallret3_ocaml.ml-O-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_ocaml.ml-O-T0--var-backend.exp b/test/rlhc.d/case/gotocallret3_ocaml.ml-O-T0--var-backend.exp
index 0d6c21ff..0d6c21ff 100644
--- a/test/cases/rlhc.d/case/gotocallret3_ocaml.ml-O-T0--var-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_ocaml.ml-O-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_ocaml.ml-O-T0--var-backend.in b/test/rlhc.d/case/gotocallret3_ocaml.ml-O-T0--var-backend.in
index f8e08a74..f8e08a74 100644
--- a/test/cases/rlhc.d/case/gotocallret3_ocaml.ml-O-T0--var-backend.in
+++ b/test/rlhc.d/case/gotocallret3_ocaml.ml-O-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_ocaml.ml-O-T1--var-backend.exp b/test/rlhc.d/case/gotocallret3_ocaml.ml-O-T1--var-backend.exp
index 9025d467..9025d467 100644
--- a/test/cases/rlhc.d/case/gotocallret3_ocaml.ml-O-T1--var-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_ocaml.ml-O-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_ocaml.ml-O-T1--var-backend.in b/test/rlhc.d/case/gotocallret3_ocaml.ml-O-T1--var-backend.in
index 91a471f8..91a471f8 100644
--- a/test/cases/rlhc.d/case/gotocallret3_ocaml.ml-O-T1--var-backend.in
+++ b/test/rlhc.d/case/gotocallret3_ocaml.ml-O-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_ruby.rb-R-F0--var-backend.exp b/test/rlhc.d/case/gotocallret3_ruby.rb-R-F0--var-backend.exp
index 7d239338..7d239338 100644
--- a/test/cases/rlhc.d/case/gotocallret3_ruby.rb-R-F0--var-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_ruby.rb-R-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_ruby.rb-R-F0--var-backend.in b/test/rlhc.d/case/gotocallret3_ruby.rb-R-F0--var-backend.in
index d336de88..d336de88 100644
--- a/test/cases/rlhc.d/case/gotocallret3_ruby.rb-R-F0--var-backend.in
+++ b/test/rlhc.d/case/gotocallret3_ruby.rb-R-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_ruby.rb-R-F1--var-backend.exp b/test/rlhc.d/case/gotocallret3_ruby.rb-R-F1--var-backend.exp
index e3840f76..e3840f76 100644
--- a/test/cases/rlhc.d/case/gotocallret3_ruby.rb-R-F1--var-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_ruby.rb-R-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_ruby.rb-R-F1--var-backend.in b/test/rlhc.d/case/gotocallret3_ruby.rb-R-F1--var-backend.in
index f74e7f93..f74e7f93 100644
--- a/test/cases/rlhc.d/case/gotocallret3_ruby.rb-R-F1--var-backend.in
+++ b/test/rlhc.d/case/gotocallret3_ruby.rb-R-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_ruby.rb-R-T0--var-backend.exp b/test/rlhc.d/case/gotocallret3_ruby.rb-R-T0--var-backend.exp
index fe91e4be..fe91e4be 100644
--- a/test/cases/rlhc.d/case/gotocallret3_ruby.rb-R-T0--var-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_ruby.rb-R-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_ruby.rb-R-T0--var-backend.in b/test/rlhc.d/case/gotocallret3_ruby.rb-R-T0--var-backend.in
index c9bb8353..c9bb8353 100644
--- a/test/cases/rlhc.d/case/gotocallret3_ruby.rb-R-T0--var-backend.in
+++ b/test/rlhc.d/case/gotocallret3_ruby.rb-R-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_ruby.rb-R-T1--var-backend.exp b/test/rlhc.d/case/gotocallret3_ruby.rb-R-T1--var-backend.exp
index e2e480b2..e2e480b2 100644
--- a/test/cases/rlhc.d/case/gotocallret3_ruby.rb-R-T1--var-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_ruby.rb-R-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_ruby.rb-R-T1--var-backend.in b/test/rlhc.d/case/gotocallret3_ruby.rb-R-T1--var-backend.in
index af36d059..af36d059 100644
--- a/test/cases/rlhc.d/case/gotocallret3_ruby.rb-R-T1--var-backend.in
+++ b/test/rlhc.d/case/gotocallret3_ruby.rb-R-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_rust.rs-U-F0--var-backend.exp b/test/rlhc.d/case/gotocallret3_rust.rs-U-F0--var-backend.exp
index b851c334..b851c334 100644
--- a/test/cases/rlhc.d/case/gotocallret3_rust.rs-U-F0--var-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_rust.rs-U-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_rust.rs-U-F0--var-backend.in b/test/rlhc.d/case/gotocallret3_rust.rs-U-F0--var-backend.in
index cb76b932..cb76b932 100644
--- a/test/cases/rlhc.d/case/gotocallret3_rust.rs-U-F0--var-backend.in
+++ b/test/rlhc.d/case/gotocallret3_rust.rs-U-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_rust.rs-U-F1--var-backend.exp b/test/rlhc.d/case/gotocallret3_rust.rs-U-F1--var-backend.exp
index c1d0efc1..c1d0efc1 100644
--- a/test/cases/rlhc.d/case/gotocallret3_rust.rs-U-F1--var-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_rust.rs-U-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_rust.rs-U-F1--var-backend.in b/test/rlhc.d/case/gotocallret3_rust.rs-U-F1--var-backend.in
index 4e309881..4e309881 100644
--- a/test/cases/rlhc.d/case/gotocallret3_rust.rs-U-F1--var-backend.in
+++ b/test/rlhc.d/case/gotocallret3_rust.rs-U-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_rust.rs-U-T0--var-backend.exp b/test/rlhc.d/case/gotocallret3_rust.rs-U-T0--var-backend.exp
index 38e23b82..38e23b82 100644
--- a/test/cases/rlhc.d/case/gotocallret3_rust.rs-U-T0--var-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_rust.rs-U-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_rust.rs-U-T0--var-backend.in b/test/rlhc.d/case/gotocallret3_rust.rs-U-T0--var-backend.in
index 7ab1203d..7ab1203d 100644
--- a/test/cases/rlhc.d/case/gotocallret3_rust.rs-U-T0--var-backend.in
+++ b/test/rlhc.d/case/gotocallret3_rust.rs-U-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/gotocallret3_rust.rs-U-T1--var-backend.exp b/test/rlhc.d/case/gotocallret3_rust.rs-U-T1--var-backend.exp
index 25e110c2..25e110c2 100644
--- a/test/cases/rlhc.d/case/gotocallret3_rust.rs-U-T1--var-backend.exp
+++ b/test/rlhc.d/case/gotocallret3_rust.rs-U-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/gotocallret3_rust.rs-U-T1--var-backend.in b/test/rlhc.d/case/gotocallret3_rust.rs-U-T1--var-backend.in
index 27a6d45b..27a6d45b 100644
--- a/test/cases/rlhc.d/case/gotocallret3_rust.rs-U-T1--var-backend.in
+++ b/test/rlhc.d/case/gotocallret3_rust.rs-U-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/high1.c-C-G0--goto-backend.exp b/test/rlhc.d/case/high1.c-C-G0--goto-backend.exp
index a5716d99..a5716d99 100644
--- a/test/cases/rlhc.d/case/high1.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/high1.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/high1.c-C-G0--goto-backend.in b/test/rlhc.d/case/high1.c-C-G0--goto-backend.in
index 595fee8c..595fee8c 100644
--- a/test/cases/rlhc.d/case/high1.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/high1.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/high1.c-C-G1--goto-backend.exp b/test/rlhc.d/case/high1.c-C-G1--goto-backend.exp
index 7df1d877..7df1d877 100644
--- a/test/cases/rlhc.d/case/high1.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/high1.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/high1.c-C-G1--goto-backend.in b/test/rlhc.d/case/high1.c-C-G1--goto-backend.in
index a04d3ae3..a04d3ae3 100644
--- a/test/cases/rlhc.d/case/high1.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/high1.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/high1.c-C-G2--goto-backend.exp b/test/rlhc.d/case/high1.c-C-G2--goto-backend.exp
index 59f8d1ce..59f8d1ce 100644
--- a/test/cases/rlhc.d/case/high1.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/high1.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/high1.c-C-G2--goto-backend.in b/test/rlhc.d/case/high1.c-C-G2--goto-backend.in
index b1898401..b1898401 100644
--- a/test/cases/rlhc.d/case/high1.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/high1.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/high1.c-C-T0--goto-backend.exp b/test/rlhc.d/case/high1.c-C-T0--goto-backend.exp
index 8b6819c3..8b6819c3 100644
--- a/test/cases/rlhc.d/case/high1.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/high1.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/high1.c-C-T0--goto-backend.in b/test/rlhc.d/case/high1.c-C-T0--goto-backend.in
index 4388d391..4388d391 100644
--- a/test/cases/rlhc.d/case/high1.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/high1.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/high1.c-C-T0--var-backend.exp b/test/rlhc.d/case/high1.c-C-T0--var-backend.exp
index f4dd0781..f4dd0781 100644
--- a/test/cases/rlhc.d/case/high1.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/high1.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/high1.c-C-T0--var-backend.in b/test/rlhc.d/case/high1.c-C-T0--var-backend.in
index 006032bd..006032bd 100644
--- a/test/cases/rlhc.d/case/high1.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/high1.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/high1.c-C-T1--goto-backend.exp b/test/rlhc.d/case/high1.c-C-T1--goto-backend.exp
index 82f74d1b..82f74d1b 100644
--- a/test/cases/rlhc.d/case/high1.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/high1.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/high1.c-C-T1--goto-backend.in b/test/rlhc.d/case/high1.c-C-T1--goto-backend.in
index 38476a46..38476a46 100644
--- a/test/cases/rlhc.d/case/high1.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/high1.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/high1.c-C-T1--var-backend.exp b/test/rlhc.d/case/high1.c-C-T1--var-backend.exp
index 21ea133a..21ea133a 100644
--- a/test/cases/rlhc.d/case/high1.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/high1.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/high1.c-C-T1--var-backend.in b/test/rlhc.d/case/high1.c-C-T1--var-backend.in
index e8f4acff..e8f4acff 100644
--- a/test/cases/rlhc.d/case/high1.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/high1.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/high2.cpp-C-F0--goto-backend.exp b/test/rlhc.d/case/high2.cpp-C-F0--goto-backend.exp
index 3f7ddfe6..3f7ddfe6 100644
--- a/test/cases/rlhc.d/case/high2.cpp-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/high2.cpp-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/high2.cpp-C-F0--goto-backend.in b/test/rlhc.d/case/high2.cpp-C-F0--goto-backend.in
index 9ffa9f9e..9ffa9f9e 100644
--- a/test/cases/rlhc.d/case/high2.cpp-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/high2.cpp-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/high2.cpp-C-F0--var-backend.exp b/test/rlhc.d/case/high2.cpp-C-F0--var-backend.exp
index eb0d658a..eb0d658a 100644
--- a/test/cases/rlhc.d/case/high2.cpp-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/high2.cpp-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/high2.cpp-C-F0--var-backend.in b/test/rlhc.d/case/high2.cpp-C-F0--var-backend.in
index 0ceb4c7b..0ceb4c7b 100644
--- a/test/cases/rlhc.d/case/high2.cpp-C-F0--var-backend.in
+++ b/test/rlhc.d/case/high2.cpp-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/high2.cpp-C-F1--goto-backend.exp b/test/rlhc.d/case/high2.cpp-C-F1--goto-backend.exp
index 884bcf6b..884bcf6b 100644
--- a/test/cases/rlhc.d/case/high2.cpp-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/high2.cpp-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/high2.cpp-C-F1--goto-backend.in b/test/rlhc.d/case/high2.cpp-C-F1--goto-backend.in
index a515edfb..a515edfb 100644
--- a/test/cases/rlhc.d/case/high2.cpp-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/high2.cpp-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/high2.cpp-C-F1--var-backend.exp b/test/rlhc.d/case/high2.cpp-C-F1--var-backend.exp
index 88883c4b..88883c4b 100644
--- a/test/cases/rlhc.d/case/high2.cpp-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/high2.cpp-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/high2.cpp-C-F1--var-backend.in b/test/rlhc.d/case/high2.cpp-C-F1--var-backend.in
index efe70c89..efe70c89 100644
--- a/test/cases/rlhc.d/case/high2.cpp-C-F1--var-backend.in
+++ b/test/rlhc.d/case/high2.cpp-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/high2.cpp-C-G0--goto-backend.exp b/test/rlhc.d/case/high2.cpp-C-G0--goto-backend.exp
index d54e09c5..d54e09c5 100644
--- a/test/cases/rlhc.d/case/high2.cpp-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/high2.cpp-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/high2.cpp-C-G0--goto-backend.in b/test/rlhc.d/case/high2.cpp-C-G0--goto-backend.in
index f1d8fe20..f1d8fe20 100644
--- a/test/cases/rlhc.d/case/high2.cpp-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/high2.cpp-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/high2.cpp-C-G1--goto-backend.exp b/test/rlhc.d/case/high2.cpp-C-G1--goto-backend.exp
index 3e3d0ff3..3e3d0ff3 100644
--- a/test/cases/rlhc.d/case/high2.cpp-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/high2.cpp-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/high2.cpp-C-G1--goto-backend.in b/test/rlhc.d/case/high2.cpp-C-G1--goto-backend.in
index f8145630..f8145630 100644
--- a/test/cases/rlhc.d/case/high2.cpp-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/high2.cpp-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/high2.cpp-C-G2--goto-backend.exp b/test/rlhc.d/case/high2.cpp-C-G2--goto-backend.exp
index fb46f884..fb46f884 100644
--- a/test/cases/rlhc.d/case/high2.cpp-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/high2.cpp-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/high2.cpp-C-G2--goto-backend.in b/test/rlhc.d/case/high2.cpp-C-G2--goto-backend.in
index 1703eeea..1703eeea 100644
--- a/test/cases/rlhc.d/case/high2.cpp-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/high2.cpp-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/high2.cpp-C-T0--goto-backend.exp b/test/rlhc.d/case/high2.cpp-C-T0--goto-backend.exp
index 7e6b9a17..7e6b9a17 100644
--- a/test/cases/rlhc.d/case/high2.cpp-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/high2.cpp-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/high2.cpp-C-T0--goto-backend.in b/test/rlhc.d/case/high2.cpp-C-T0--goto-backend.in
index ab54b5ae..ab54b5ae 100644
--- a/test/cases/rlhc.d/case/high2.cpp-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/high2.cpp-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/high2.cpp-C-T0--var-backend.exp b/test/rlhc.d/case/high2.cpp-C-T0--var-backend.exp
index a54d77e1..a54d77e1 100644
--- a/test/cases/rlhc.d/case/high2.cpp-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/high2.cpp-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/high2.cpp-C-T0--var-backend.in b/test/rlhc.d/case/high2.cpp-C-T0--var-backend.in
index 259b74b8..259b74b8 100644
--- a/test/cases/rlhc.d/case/high2.cpp-C-T0--var-backend.in
+++ b/test/rlhc.d/case/high2.cpp-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/high2.cpp-C-T1--goto-backend.exp b/test/rlhc.d/case/high2.cpp-C-T1--goto-backend.exp
index 4bd2b3db..4bd2b3db 100644
--- a/test/cases/rlhc.d/case/high2.cpp-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/high2.cpp-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/high2.cpp-C-T1--goto-backend.in b/test/rlhc.d/case/high2.cpp-C-T1--goto-backend.in
index e439060a..e439060a 100644
--- a/test/cases/rlhc.d/case/high2.cpp-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/high2.cpp-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/high2.cpp-C-T1--var-backend.exp b/test/rlhc.d/case/high2.cpp-C-T1--var-backend.exp
index 39a5cfa0..39a5cfa0 100644
--- a/test/cases/rlhc.d/case/high2.cpp-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/high2.cpp-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/high2.cpp-C-T1--var-backend.in b/test/rlhc.d/case/high2.cpp-C-T1--var-backend.in
index 6e8b8d03..6e8b8d03 100644
--- a/test/cases/rlhc.d/case/high2.cpp-C-T1--var-backend.in
+++ b/test/rlhc.d/case/high2.cpp-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/high3.m-C-F0--goto-backend.exp b/test/rlhc.d/case/high3.m-C-F0--goto-backend.exp
index bd200133..bd200133 100644
--- a/test/cases/rlhc.d/case/high3.m-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/high3.m-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/high3.m-C-F0--goto-backend.in b/test/rlhc.d/case/high3.m-C-F0--goto-backend.in
index 99a5f6a2..99a5f6a2 100644
--- a/test/cases/rlhc.d/case/high3.m-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/high3.m-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/high3.m-C-F0--var-backend.exp b/test/rlhc.d/case/high3.m-C-F0--var-backend.exp
index fa53f257..fa53f257 100644
--- a/test/cases/rlhc.d/case/high3.m-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/high3.m-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/high3.m-C-F0--var-backend.in b/test/rlhc.d/case/high3.m-C-F0--var-backend.in
index 02622c53..02622c53 100644
--- a/test/cases/rlhc.d/case/high3.m-C-F0--var-backend.in
+++ b/test/rlhc.d/case/high3.m-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/high3.m-C-F1--goto-backend.exp b/test/rlhc.d/case/high3.m-C-F1--goto-backend.exp
index 957ad429..957ad429 100644
--- a/test/cases/rlhc.d/case/high3.m-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/high3.m-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/high3.m-C-F1--goto-backend.in b/test/rlhc.d/case/high3.m-C-F1--goto-backend.in
index 752abbc8..752abbc8 100644
--- a/test/cases/rlhc.d/case/high3.m-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/high3.m-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/high3.m-C-F1--var-backend.exp b/test/rlhc.d/case/high3.m-C-F1--var-backend.exp
index fd429860..fd429860 100644
--- a/test/cases/rlhc.d/case/high3.m-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/high3.m-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/high3.m-C-F1--var-backend.in b/test/rlhc.d/case/high3.m-C-F1--var-backend.in
index 63de23c8..63de23c8 100644
--- a/test/cases/rlhc.d/case/high3.m-C-F1--var-backend.in
+++ b/test/rlhc.d/case/high3.m-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/high3.m-C-G0--goto-backend.exp b/test/rlhc.d/case/high3.m-C-G0--goto-backend.exp
index 76e6b344..76e6b344 100644
--- a/test/cases/rlhc.d/case/high3.m-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/high3.m-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/high3.m-C-G0--goto-backend.in b/test/rlhc.d/case/high3.m-C-G0--goto-backend.in
index 7d446426..7d446426 100644
--- a/test/cases/rlhc.d/case/high3.m-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/high3.m-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/high3.m-C-G1--goto-backend.exp b/test/rlhc.d/case/high3.m-C-G1--goto-backend.exp
index 6c83bf00..6c83bf00 100644
--- a/test/cases/rlhc.d/case/high3.m-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/high3.m-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/high3.m-C-G1--goto-backend.in b/test/rlhc.d/case/high3.m-C-G1--goto-backend.in
index 9879b66d..9879b66d 100644
--- a/test/cases/rlhc.d/case/high3.m-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/high3.m-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/high3.m-C-G2--goto-backend.exp b/test/rlhc.d/case/high3.m-C-G2--goto-backend.exp
index deafa2ff..deafa2ff 100644
--- a/test/cases/rlhc.d/case/high3.m-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/high3.m-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/high3.m-C-G2--goto-backend.in b/test/rlhc.d/case/high3.m-C-G2--goto-backend.in
index b496522c..b496522c 100644
--- a/test/cases/rlhc.d/case/high3.m-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/high3.m-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/high3.m-C-T0--goto-backend.exp b/test/rlhc.d/case/high3.m-C-T0--goto-backend.exp
index 15922a07..15922a07 100644
--- a/test/cases/rlhc.d/case/high3.m-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/high3.m-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/high3.m-C-T0--goto-backend.in b/test/rlhc.d/case/high3.m-C-T0--goto-backend.in
index 22d1d110..22d1d110 100644
--- a/test/cases/rlhc.d/case/high3.m-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/high3.m-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/high3.m-C-T0--var-backend.exp b/test/rlhc.d/case/high3.m-C-T0--var-backend.exp
index d4055090..d4055090 100644
--- a/test/cases/rlhc.d/case/high3.m-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/high3.m-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/high3.m-C-T0--var-backend.in b/test/rlhc.d/case/high3.m-C-T0--var-backend.in
index acb2b0ad..acb2b0ad 100644
--- a/test/cases/rlhc.d/case/high3.m-C-T0--var-backend.in
+++ b/test/rlhc.d/case/high3.m-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/high3.m-C-T1--goto-backend.exp b/test/rlhc.d/case/high3.m-C-T1--goto-backend.exp
index b8a894a7..b8a894a7 100644
--- a/test/cases/rlhc.d/case/high3.m-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/high3.m-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/high3.m-C-T1--goto-backend.in b/test/rlhc.d/case/high3.m-C-T1--goto-backend.in
index 48ce1b5f..48ce1b5f 100644
--- a/test/cases/rlhc.d/case/high3.m-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/high3.m-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/high3.m-C-T1--var-backend.exp b/test/rlhc.d/case/high3.m-C-T1--var-backend.exp
index 21643006..21643006 100644
--- a/test/cases/rlhc.d/case/high3.m-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/high3.m-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/high3.m-C-T1--var-backend.in b/test/rlhc.d/case/high3.m-C-T1--var-backend.in
index c164374c..c164374c 100644
--- a/test/cases/rlhc.d/case/high3.m-C-T1--var-backend.in
+++ b/test/rlhc.d/case/high3.m-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/import1.c-C-F0--goto-backend.exp b/test/rlhc.d/case/import1.c-C-F0--goto-backend.exp
index 20bee4be..20bee4be 100644
--- a/test/cases/rlhc.d/case/import1.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/import1.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/import1.c-C-F0--goto-backend.in b/test/rlhc.d/case/import1.c-C-F0--goto-backend.in
index 4df1b178..4df1b178 100644
--- a/test/cases/rlhc.d/case/import1.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/import1.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/import1.c-C-F0--var-backend.exp b/test/rlhc.d/case/import1.c-C-F0--var-backend.exp
index 2e62249c..2e62249c 100644
--- a/test/cases/rlhc.d/case/import1.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/import1.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/import1.c-C-F0--var-backend.in b/test/rlhc.d/case/import1.c-C-F0--var-backend.in
index 658f6af6..658f6af6 100644
--- a/test/cases/rlhc.d/case/import1.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/import1.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/import1.c-C-F1--goto-backend.exp b/test/rlhc.d/case/import1.c-C-F1--goto-backend.exp
index dba82ac3..dba82ac3 100644
--- a/test/cases/rlhc.d/case/import1.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/import1.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/import1.c-C-F1--goto-backend.in b/test/rlhc.d/case/import1.c-C-F1--goto-backend.in
index 55b30756..55b30756 100644
--- a/test/cases/rlhc.d/case/import1.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/import1.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/import1.c-C-F1--var-backend.exp b/test/rlhc.d/case/import1.c-C-F1--var-backend.exp
index 5e9e411c..5e9e411c 100644
--- a/test/cases/rlhc.d/case/import1.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/import1.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/import1.c-C-F1--var-backend.in b/test/rlhc.d/case/import1.c-C-F1--var-backend.in
index 018fa559..018fa559 100644
--- a/test/cases/rlhc.d/case/import1.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/import1.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/import1.c-C-G0--goto-backend.exp b/test/rlhc.d/case/import1.c-C-G0--goto-backend.exp
index f52eaed4..f52eaed4 100644
--- a/test/cases/rlhc.d/case/import1.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/import1.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/import1.c-C-G0--goto-backend.in b/test/rlhc.d/case/import1.c-C-G0--goto-backend.in
index 2d78e1df..2d78e1df 100644
--- a/test/cases/rlhc.d/case/import1.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/import1.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/import1.c-C-G1--goto-backend.exp b/test/rlhc.d/case/import1.c-C-G1--goto-backend.exp
index 13f4e6fd..13f4e6fd 100644
--- a/test/cases/rlhc.d/case/import1.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/import1.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/import1.c-C-G1--goto-backend.in b/test/rlhc.d/case/import1.c-C-G1--goto-backend.in
index 81d955a6..81d955a6 100644
--- a/test/cases/rlhc.d/case/import1.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/import1.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/import1.c-C-G2--goto-backend.exp b/test/rlhc.d/case/import1.c-C-G2--goto-backend.exp
index 51b188d3..51b188d3 100644
--- a/test/cases/rlhc.d/case/import1.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/import1.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/import1.c-C-G2--goto-backend.in b/test/rlhc.d/case/import1.c-C-G2--goto-backend.in
index 56e0f4f1..56e0f4f1 100644
--- a/test/cases/rlhc.d/case/import1.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/import1.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/import1.c-C-T0--goto-backend.exp b/test/rlhc.d/case/import1.c-C-T0--goto-backend.exp
index 9f235deb..9f235deb 100644
--- a/test/cases/rlhc.d/case/import1.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/import1.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/import1.c-C-T0--goto-backend.in b/test/rlhc.d/case/import1.c-C-T0--goto-backend.in
index 8a11e842..8a11e842 100644
--- a/test/cases/rlhc.d/case/import1.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/import1.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/import1.c-C-T0--var-backend.exp b/test/rlhc.d/case/import1.c-C-T0--var-backend.exp
index 215686e2..215686e2 100644
--- a/test/cases/rlhc.d/case/import1.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/import1.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/import1.c-C-T0--var-backend.in b/test/rlhc.d/case/import1.c-C-T0--var-backend.in
index d3173121..d3173121 100644
--- a/test/cases/rlhc.d/case/import1.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/import1.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/import1.c-C-T1--goto-backend.exp b/test/rlhc.d/case/import1.c-C-T1--goto-backend.exp
index f43244e1..f43244e1 100644
--- a/test/cases/rlhc.d/case/import1.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/import1.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/import1.c-C-T1--goto-backend.in b/test/rlhc.d/case/import1.c-C-T1--goto-backend.in
index a1d09cc4..a1d09cc4 100644
--- a/test/cases/rlhc.d/case/import1.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/import1.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/import1.c-C-T1--var-backend.exp b/test/rlhc.d/case/import1.c-C-T1--var-backend.exp
index f725ae47..f725ae47 100644
--- a/test/cases/rlhc.d/case/import1.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/import1.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/import1.c-C-T1--var-backend.in b/test/rlhc.d/case/import1.c-C-T1--var-backend.in
index fcc4adae..fcc4adae 100644
--- a/test/cases/rlhc.d/case/import1.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/import1.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/include2.c-C-F0--goto-backend.exp b/test/rlhc.d/case/include2.c-C-F0--goto-backend.exp
index 71ae785c..71ae785c 100644
--- a/test/cases/rlhc.d/case/include2.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/include2.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/include2.c-C-F0--goto-backend.in b/test/rlhc.d/case/include2.c-C-F0--goto-backend.in
index 60a10a9d..60a10a9d 100644
--- a/test/cases/rlhc.d/case/include2.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/include2.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/include2.c-C-F0--var-backend.exp b/test/rlhc.d/case/include2.c-C-F0--var-backend.exp
index 66ff9424..66ff9424 100644
--- a/test/cases/rlhc.d/case/include2.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/include2.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/include2.c-C-F0--var-backend.in b/test/rlhc.d/case/include2.c-C-F0--var-backend.in
index 1cc377e8..1cc377e8 100644
--- a/test/cases/rlhc.d/case/include2.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/include2.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/include2.c-C-F1--goto-backend.exp b/test/rlhc.d/case/include2.c-C-F1--goto-backend.exp
index 707bd80c..707bd80c 100644
--- a/test/cases/rlhc.d/case/include2.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/include2.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/include2.c-C-F1--goto-backend.in b/test/rlhc.d/case/include2.c-C-F1--goto-backend.in
index 6fbb2a3a..6fbb2a3a 100644
--- a/test/cases/rlhc.d/case/include2.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/include2.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/include2.c-C-F1--var-backend.exp b/test/rlhc.d/case/include2.c-C-F1--var-backend.exp
index 8b33b8b3..8b33b8b3 100644
--- a/test/cases/rlhc.d/case/include2.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/include2.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/include2.c-C-F1--var-backend.in b/test/rlhc.d/case/include2.c-C-F1--var-backend.in
index 197bb65c..197bb65c 100644
--- a/test/cases/rlhc.d/case/include2.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/include2.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/include2.c-C-G0--goto-backend.exp b/test/rlhc.d/case/include2.c-C-G0--goto-backend.exp
index 5e335e83..5e335e83 100644
--- a/test/cases/rlhc.d/case/include2.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/include2.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/include2.c-C-G0--goto-backend.in b/test/rlhc.d/case/include2.c-C-G0--goto-backend.in
index eab04065..eab04065 100644
--- a/test/cases/rlhc.d/case/include2.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/include2.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/include2.c-C-G1--goto-backend.exp b/test/rlhc.d/case/include2.c-C-G1--goto-backend.exp
index d6710a45..d6710a45 100644
--- a/test/cases/rlhc.d/case/include2.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/include2.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/include2.c-C-G1--goto-backend.in b/test/rlhc.d/case/include2.c-C-G1--goto-backend.in
index fbe8ea99..fbe8ea99 100644
--- a/test/cases/rlhc.d/case/include2.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/include2.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/include2.c-C-G2--goto-backend.exp b/test/rlhc.d/case/include2.c-C-G2--goto-backend.exp
index 833efc72..833efc72 100644
--- a/test/cases/rlhc.d/case/include2.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/include2.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/include2.c-C-G2--goto-backend.in b/test/rlhc.d/case/include2.c-C-G2--goto-backend.in
index e59a6ba6..e59a6ba6 100644
--- a/test/cases/rlhc.d/case/include2.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/include2.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/include2.c-C-T0--goto-backend.exp b/test/rlhc.d/case/include2.c-C-T0--goto-backend.exp
index 68c70f15..68c70f15 100644
--- a/test/cases/rlhc.d/case/include2.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/include2.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/include2.c-C-T0--goto-backend.in b/test/rlhc.d/case/include2.c-C-T0--goto-backend.in
index 18b043f7..18b043f7 100644
--- a/test/cases/rlhc.d/case/include2.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/include2.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/include2.c-C-T0--var-backend.exp b/test/rlhc.d/case/include2.c-C-T0--var-backend.exp
index 80567bc0..80567bc0 100644
--- a/test/cases/rlhc.d/case/include2.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/include2.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/include2.c-C-T0--var-backend.in b/test/rlhc.d/case/include2.c-C-T0--var-backend.in
index 4fd411a2..4fd411a2 100644
--- a/test/cases/rlhc.d/case/include2.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/include2.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/include2.c-C-T1--goto-backend.exp b/test/rlhc.d/case/include2.c-C-T1--goto-backend.exp
index fc0689a5..fc0689a5 100644
--- a/test/cases/rlhc.d/case/include2.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/include2.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/include2.c-C-T1--goto-backend.in b/test/rlhc.d/case/include2.c-C-T1--goto-backend.in
index 700ccf4a..700ccf4a 100644
--- a/test/cases/rlhc.d/case/include2.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/include2.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/include2.c-C-T1--var-backend.exp b/test/rlhc.d/case/include2.c-C-T1--var-backend.exp
index 8e574fec..8e574fec 100644
--- a/test/cases/rlhc.d/case/include2.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/include2.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/include2.c-C-T1--var-backend.in b/test/rlhc.d/case/include2.c-C-T1--var-backend.in
index 59c5d292..59c5d292 100644
--- a/test/cases/rlhc.d/case/include2.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/include2.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/java1.java-J-F0--goto-backend.exp b/test/rlhc.d/case/java1.java-J-F0--goto-backend.exp
index 40be203d..40be203d 100644
--- a/test/cases/rlhc.d/case/java1.java-J-F0--goto-backend.exp
+++ b/test/rlhc.d/case/java1.java-J-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/java1.java-J-F0--goto-backend.in b/test/rlhc.d/case/java1.java-J-F0--goto-backend.in
index 723d3936..723d3936 100644
--- a/test/cases/rlhc.d/case/java1.java-J-F0--goto-backend.in
+++ b/test/rlhc.d/case/java1.java-J-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/java1.java-J-F0--var-backend.exp b/test/rlhc.d/case/java1.java-J-F0--var-backend.exp
index 14a04a31..14a04a31 100644
--- a/test/cases/rlhc.d/case/java1.java-J-F0--var-backend.exp
+++ b/test/rlhc.d/case/java1.java-J-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/java1.java-J-F0--var-backend.in b/test/rlhc.d/case/java1.java-J-F0--var-backend.in
index 8c7245bc..8c7245bc 100644
--- a/test/cases/rlhc.d/case/java1.java-J-F0--var-backend.in
+++ b/test/rlhc.d/case/java1.java-J-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/java1.java-J-F1--goto-backend.exp b/test/rlhc.d/case/java1.java-J-F1--goto-backend.exp
index 48d5e559..48d5e559 100644
--- a/test/cases/rlhc.d/case/java1.java-J-F1--goto-backend.exp
+++ b/test/rlhc.d/case/java1.java-J-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/java1.java-J-F1--goto-backend.in b/test/rlhc.d/case/java1.java-J-F1--goto-backend.in
index 6a7951e1..6a7951e1 100644
--- a/test/cases/rlhc.d/case/java1.java-J-F1--goto-backend.in
+++ b/test/rlhc.d/case/java1.java-J-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/java1.java-J-F1--var-backend.exp b/test/rlhc.d/case/java1.java-J-F1--var-backend.exp
index f5798308..f5798308 100644
--- a/test/cases/rlhc.d/case/java1.java-J-F1--var-backend.exp
+++ b/test/rlhc.d/case/java1.java-J-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/java1.java-J-F1--var-backend.in b/test/rlhc.d/case/java1.java-J-F1--var-backend.in
index 8b4ac483..8b4ac483 100644
--- a/test/cases/rlhc.d/case/java1.java-J-F1--var-backend.in
+++ b/test/rlhc.d/case/java1.java-J-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/java1.java-J-T0--goto-backend.exp b/test/rlhc.d/case/java1.java-J-T0--goto-backend.exp
index 77727d3e..77727d3e 100644
--- a/test/cases/rlhc.d/case/java1.java-J-T0--goto-backend.exp
+++ b/test/rlhc.d/case/java1.java-J-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/java1.java-J-T0--goto-backend.in b/test/rlhc.d/case/java1.java-J-T0--goto-backend.in
index 9f059cf5..9f059cf5 100644
--- a/test/cases/rlhc.d/case/java1.java-J-T0--goto-backend.in
+++ b/test/rlhc.d/case/java1.java-J-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/java1.java-J-T0--var-backend.exp b/test/rlhc.d/case/java1.java-J-T0--var-backend.exp
index a6fb848f..a6fb848f 100644
--- a/test/cases/rlhc.d/case/java1.java-J-T0--var-backend.exp
+++ b/test/rlhc.d/case/java1.java-J-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/java1.java-J-T0--var-backend.in b/test/rlhc.d/case/java1.java-J-T0--var-backend.in
index 15d54947..15d54947 100644
--- a/test/cases/rlhc.d/case/java1.java-J-T0--var-backend.in
+++ b/test/rlhc.d/case/java1.java-J-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/java1.java-J-T1--goto-backend.exp b/test/rlhc.d/case/java1.java-J-T1--goto-backend.exp
index 2f6f663c..2f6f663c 100644
--- a/test/cases/rlhc.d/case/java1.java-J-T1--goto-backend.exp
+++ b/test/rlhc.d/case/java1.java-J-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/java1.java-J-T1--goto-backend.in b/test/rlhc.d/case/java1.java-J-T1--goto-backend.in
index ecb5f31c..ecb5f31c 100644
--- a/test/cases/rlhc.d/case/java1.java-J-T1--goto-backend.in
+++ b/test/rlhc.d/case/java1.java-J-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/java1.java-J-T1--var-backend.exp b/test/rlhc.d/case/java1.java-J-T1--var-backend.exp
index 6ac94ec9..6ac94ec9 100644
--- a/test/cases/rlhc.d/case/java1.java-J-T1--var-backend.exp
+++ b/test/rlhc.d/case/java1.java-J-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/java1.java-J-T1--var-backend.in b/test/rlhc.d/case/java1.java-J-T1--var-backend.in
index 57ce9ae0..57ce9ae0 100644
--- a/test/cases/rlhc.d/case/java1.java-J-T1--var-backend.in
+++ b/test/rlhc.d/case/java1.java-J-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/java2.java-J-T0--goto-backend.exp b/test/rlhc.d/case/java2.java-J-T0--goto-backend.exp
index 1bdb861e..1bdb861e 100644
--- a/test/cases/rlhc.d/case/java2.java-J-T0--goto-backend.exp
+++ b/test/rlhc.d/case/java2.java-J-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/java2.java-J-T0--goto-backend.in b/test/rlhc.d/case/java2.java-J-T0--goto-backend.in
index 7c6fd026..7c6fd026 100644
--- a/test/cases/rlhc.d/case/java2.java-J-T0--goto-backend.in
+++ b/test/rlhc.d/case/java2.java-J-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/java2.java-J-T0--var-backend.exp b/test/rlhc.d/case/java2.java-J-T0--var-backend.exp
index c803a53f..c803a53f 100644
--- a/test/cases/rlhc.d/case/java2.java-J-T0--var-backend.exp
+++ b/test/rlhc.d/case/java2.java-J-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/java2.java-J-T0--var-backend.in b/test/rlhc.d/case/java2.java-J-T0--var-backend.in
index 9b65123c..9b65123c 100644
--- a/test/cases/rlhc.d/case/java2.java-J-T0--var-backend.in
+++ b/test/rlhc.d/case/java2.java-J-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/java2.java-J-T1--goto-backend.exp b/test/rlhc.d/case/java2.java-J-T1--goto-backend.exp
index cc489db6..cc489db6 100644
--- a/test/cases/rlhc.d/case/java2.java-J-T1--goto-backend.exp
+++ b/test/rlhc.d/case/java2.java-J-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/java2.java-J-T1--goto-backend.in b/test/rlhc.d/case/java2.java-J-T1--goto-backend.in
index 252bc844..252bc844 100644
--- a/test/cases/rlhc.d/case/java2.java-J-T1--goto-backend.in
+++ b/test/rlhc.d/case/java2.java-J-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/java2.java-J-T1--var-backend.exp b/test/rlhc.d/case/java2.java-J-T1--var-backend.exp
index fc2de67e..fc2de67e 100644
--- a/test/cases/rlhc.d/case/java2.java-J-T1--var-backend.exp
+++ b/test/rlhc.d/case/java2.java-J-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/java2.java-J-T1--var-backend.in b/test/rlhc.d/case/java2.java-J-T1--var-backend.in
index 0488837f..0488837f 100644
--- a/test/cases/rlhc.d/case/java2.java-J-T1--var-backend.in
+++ b/test/rlhc.d/case/java2.java-J-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/julia1.jl-Y-F0--var-backend.exp b/test/rlhc.d/case/julia1.jl-Y-F0--var-backend.exp
index cb124f54..cb124f54 100644
--- a/test/cases/rlhc.d/case/julia1.jl-Y-F0--var-backend.exp
+++ b/test/rlhc.d/case/julia1.jl-Y-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/julia1.jl-Y-F0--var-backend.in b/test/rlhc.d/case/julia1.jl-Y-F0--var-backend.in
index 06f237c3..06f237c3 100644
--- a/test/cases/rlhc.d/case/julia1.jl-Y-F0--var-backend.in
+++ b/test/rlhc.d/case/julia1.jl-Y-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/julia1.jl-Y-F1--var-backend.exp b/test/rlhc.d/case/julia1.jl-Y-F1--var-backend.exp
index 899fb2bf..899fb2bf 100644
--- a/test/cases/rlhc.d/case/julia1.jl-Y-F1--var-backend.exp
+++ b/test/rlhc.d/case/julia1.jl-Y-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/julia1.jl-Y-F1--var-backend.in b/test/rlhc.d/case/julia1.jl-Y-F1--var-backend.in
index 08668860..08668860 100644
--- a/test/cases/rlhc.d/case/julia1.jl-Y-F1--var-backend.in
+++ b/test/rlhc.d/case/julia1.jl-Y-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/julia1.jl-Y-T0--var-backend.exp b/test/rlhc.d/case/julia1.jl-Y-T0--var-backend.exp
index 0af17663..0af17663 100644
--- a/test/cases/rlhc.d/case/julia1.jl-Y-T0--var-backend.exp
+++ b/test/rlhc.d/case/julia1.jl-Y-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/julia1.jl-Y-T0--var-backend.in b/test/rlhc.d/case/julia1.jl-Y-T0--var-backend.in
index 37256f9e..37256f9e 100644
--- a/test/cases/rlhc.d/case/julia1.jl-Y-T0--var-backend.in
+++ b/test/rlhc.d/case/julia1.jl-Y-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/julia1.jl-Y-T1--var-backend.exp b/test/rlhc.d/case/julia1.jl-Y-T1--var-backend.exp
index 7fbe60c3..7fbe60c3 100644
--- a/test/cases/rlhc.d/case/julia1.jl-Y-T1--var-backend.exp
+++ b/test/rlhc.d/case/julia1.jl-Y-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/julia1.jl-Y-T1--var-backend.in b/test/rlhc.d/case/julia1.jl-Y-T1--var-backend.in
index f753c79d..f753c79d 100644
--- a/test/cases/rlhc.d/case/julia1.jl-Y-T1--var-backend.in
+++ b/test/rlhc.d/case/julia1.jl-Y-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/keller1.cpp-C-F0--goto-backend.exp b/test/rlhc.d/case/keller1.cpp-C-F0--goto-backend.exp
index 1e77b1a7..1e77b1a7 100644
--- a/test/cases/rlhc.d/case/keller1.cpp-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/keller1.cpp-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/keller1.cpp-C-F0--goto-backend.in b/test/rlhc.d/case/keller1.cpp-C-F0--goto-backend.in
index 91e9bf41..91e9bf41 100644
--- a/test/cases/rlhc.d/case/keller1.cpp-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/keller1.cpp-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/keller1.cpp-C-F0--var-backend.exp b/test/rlhc.d/case/keller1.cpp-C-F0--var-backend.exp
index af4dcaa0..af4dcaa0 100644
--- a/test/cases/rlhc.d/case/keller1.cpp-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/keller1.cpp-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/keller1.cpp-C-F0--var-backend.in b/test/rlhc.d/case/keller1.cpp-C-F0--var-backend.in
index 1a824d0a..1a824d0a 100644
--- a/test/cases/rlhc.d/case/keller1.cpp-C-F0--var-backend.in
+++ b/test/rlhc.d/case/keller1.cpp-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/keller1.cpp-C-F1--goto-backend.exp b/test/rlhc.d/case/keller1.cpp-C-F1--goto-backend.exp
index 28fcbe00..28fcbe00 100644
--- a/test/cases/rlhc.d/case/keller1.cpp-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/keller1.cpp-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/keller1.cpp-C-F1--goto-backend.in b/test/rlhc.d/case/keller1.cpp-C-F1--goto-backend.in
index c16cc53a..c16cc53a 100644
--- a/test/cases/rlhc.d/case/keller1.cpp-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/keller1.cpp-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/keller1.cpp-C-F1--var-backend.exp b/test/rlhc.d/case/keller1.cpp-C-F1--var-backend.exp
index f18e4658..f18e4658 100644
--- a/test/cases/rlhc.d/case/keller1.cpp-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/keller1.cpp-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/keller1.cpp-C-F1--var-backend.in b/test/rlhc.d/case/keller1.cpp-C-F1--var-backend.in
index d0385bf9..d0385bf9 100644
--- a/test/cases/rlhc.d/case/keller1.cpp-C-F1--var-backend.in
+++ b/test/rlhc.d/case/keller1.cpp-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/keller1.cpp-C-G0--goto-backend.exp b/test/rlhc.d/case/keller1.cpp-C-G0--goto-backend.exp
index a45a3f7d..a45a3f7d 100644
--- a/test/cases/rlhc.d/case/keller1.cpp-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/keller1.cpp-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/keller1.cpp-C-G0--goto-backend.in b/test/rlhc.d/case/keller1.cpp-C-G0--goto-backend.in
index f9444a8d..f9444a8d 100644
--- a/test/cases/rlhc.d/case/keller1.cpp-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/keller1.cpp-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/keller1.cpp-C-G1--goto-backend.exp b/test/rlhc.d/case/keller1.cpp-C-G1--goto-backend.exp
index 76cedb82..76cedb82 100644
--- a/test/cases/rlhc.d/case/keller1.cpp-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/keller1.cpp-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/keller1.cpp-C-G1--goto-backend.in b/test/rlhc.d/case/keller1.cpp-C-G1--goto-backend.in
index 99191e0d..99191e0d 100644
--- a/test/cases/rlhc.d/case/keller1.cpp-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/keller1.cpp-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/keller1.cpp-C-G2--goto-backend.exp b/test/rlhc.d/case/keller1.cpp-C-G2--goto-backend.exp
index 6c55854a..6c55854a 100644
--- a/test/cases/rlhc.d/case/keller1.cpp-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/keller1.cpp-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/keller1.cpp-C-G2--goto-backend.in b/test/rlhc.d/case/keller1.cpp-C-G2--goto-backend.in
index 45661ea1..45661ea1 100644
--- a/test/cases/rlhc.d/case/keller1.cpp-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/keller1.cpp-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/keller1.cpp-C-T0--goto-backend.exp b/test/rlhc.d/case/keller1.cpp-C-T0--goto-backend.exp
index dfe4dad0..dfe4dad0 100644
--- a/test/cases/rlhc.d/case/keller1.cpp-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/keller1.cpp-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/keller1.cpp-C-T0--goto-backend.in b/test/rlhc.d/case/keller1.cpp-C-T0--goto-backend.in
index 722368c6..722368c6 100644
--- a/test/cases/rlhc.d/case/keller1.cpp-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/keller1.cpp-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/keller1.cpp-C-T0--var-backend.exp b/test/rlhc.d/case/keller1.cpp-C-T0--var-backend.exp
index 5910d981..5910d981 100644
--- a/test/cases/rlhc.d/case/keller1.cpp-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/keller1.cpp-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/keller1.cpp-C-T0--var-backend.in b/test/rlhc.d/case/keller1.cpp-C-T0--var-backend.in
index c0f582e5..c0f582e5 100644
--- a/test/cases/rlhc.d/case/keller1.cpp-C-T0--var-backend.in
+++ b/test/rlhc.d/case/keller1.cpp-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/keller1.cpp-C-T1--goto-backend.exp b/test/rlhc.d/case/keller1.cpp-C-T1--goto-backend.exp
index 9a1e7bc4..9a1e7bc4 100644
--- a/test/cases/rlhc.d/case/keller1.cpp-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/keller1.cpp-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/keller1.cpp-C-T1--goto-backend.in b/test/rlhc.d/case/keller1.cpp-C-T1--goto-backend.in
index bcbb9665..bcbb9665 100644
--- a/test/cases/rlhc.d/case/keller1.cpp-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/keller1.cpp-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/keller1.cpp-C-T1--var-backend.exp b/test/rlhc.d/case/keller1.cpp-C-T1--var-backend.exp
index df57973c..df57973c 100644
--- a/test/cases/rlhc.d/case/keller1.cpp-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/keller1.cpp-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/keller1.cpp-C-T1--var-backend.in b/test/rlhc.d/case/keller1.cpp-C-T1--var-backend.in
index 34287c2d..34287c2d 100644
--- a/test/cases/rlhc.d/case/keller1.cpp-C-T1--var-backend.in
+++ b/test/rlhc.d/case/keller1.cpp-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/lmgoto.cpp-C-F0--goto-backend.exp b/test/rlhc.d/case/lmgoto.cpp-C-F0--goto-backend.exp
index 42a9359f..42a9359f 100644
--- a/test/cases/rlhc.d/case/lmgoto.cpp-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/lmgoto.cpp-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/lmgoto.cpp-C-F0--goto-backend.in b/test/rlhc.d/case/lmgoto.cpp-C-F0--goto-backend.in
index f7b46518..f7b46518 100644
--- a/test/cases/rlhc.d/case/lmgoto.cpp-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/lmgoto.cpp-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/lmgoto.cpp-C-F0--var-backend.exp b/test/rlhc.d/case/lmgoto.cpp-C-F0--var-backend.exp
index 544f9264..544f9264 100644
--- a/test/cases/rlhc.d/case/lmgoto.cpp-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/lmgoto.cpp-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/lmgoto.cpp-C-F0--var-backend.in b/test/rlhc.d/case/lmgoto.cpp-C-F0--var-backend.in
index 664136e7..664136e7 100644
--- a/test/cases/rlhc.d/case/lmgoto.cpp-C-F0--var-backend.in
+++ b/test/rlhc.d/case/lmgoto.cpp-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/lmgoto.cpp-C-F1--goto-backend.exp b/test/rlhc.d/case/lmgoto.cpp-C-F1--goto-backend.exp
index 648f948d..648f948d 100644
--- a/test/cases/rlhc.d/case/lmgoto.cpp-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/lmgoto.cpp-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/lmgoto.cpp-C-F1--goto-backend.in b/test/rlhc.d/case/lmgoto.cpp-C-F1--goto-backend.in
index a010b63b..a010b63b 100644
--- a/test/cases/rlhc.d/case/lmgoto.cpp-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/lmgoto.cpp-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/lmgoto.cpp-C-F1--var-backend.exp b/test/rlhc.d/case/lmgoto.cpp-C-F1--var-backend.exp
index a6a9f433..a6a9f433 100644
--- a/test/cases/rlhc.d/case/lmgoto.cpp-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/lmgoto.cpp-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/lmgoto.cpp-C-F1--var-backend.in b/test/rlhc.d/case/lmgoto.cpp-C-F1--var-backend.in
index 122b44b6..122b44b6 100644
--- a/test/cases/rlhc.d/case/lmgoto.cpp-C-F1--var-backend.in
+++ b/test/rlhc.d/case/lmgoto.cpp-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/lmgoto.cpp-C-G0--goto-backend.exp b/test/rlhc.d/case/lmgoto.cpp-C-G0--goto-backend.exp
index fc5bf9e6..fc5bf9e6 100644
--- a/test/cases/rlhc.d/case/lmgoto.cpp-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/lmgoto.cpp-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/lmgoto.cpp-C-G0--goto-backend.in b/test/rlhc.d/case/lmgoto.cpp-C-G0--goto-backend.in
index a3f8692c..a3f8692c 100644
--- a/test/cases/rlhc.d/case/lmgoto.cpp-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/lmgoto.cpp-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/lmgoto.cpp-C-G1--goto-backend.exp b/test/rlhc.d/case/lmgoto.cpp-C-G1--goto-backend.exp
index 92e0da74..92e0da74 100644
--- a/test/cases/rlhc.d/case/lmgoto.cpp-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/lmgoto.cpp-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/lmgoto.cpp-C-G1--goto-backend.in b/test/rlhc.d/case/lmgoto.cpp-C-G1--goto-backend.in
index 2cd47865..2cd47865 100644
--- a/test/cases/rlhc.d/case/lmgoto.cpp-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/lmgoto.cpp-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/lmgoto.cpp-C-G2--goto-backend.exp b/test/rlhc.d/case/lmgoto.cpp-C-G2--goto-backend.exp
index 6860bc7c..6860bc7c 100644
--- a/test/cases/rlhc.d/case/lmgoto.cpp-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/lmgoto.cpp-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/lmgoto.cpp-C-G2--goto-backend.in b/test/rlhc.d/case/lmgoto.cpp-C-G2--goto-backend.in
index 9283ed28..9283ed28 100644
--- a/test/cases/rlhc.d/case/lmgoto.cpp-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/lmgoto.cpp-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/lmgoto.cpp-C-T0--goto-backend.exp b/test/rlhc.d/case/lmgoto.cpp-C-T0--goto-backend.exp
index 5a0c417d..5a0c417d 100644
--- a/test/cases/rlhc.d/case/lmgoto.cpp-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/lmgoto.cpp-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/lmgoto.cpp-C-T0--goto-backend.in b/test/rlhc.d/case/lmgoto.cpp-C-T0--goto-backend.in
index ca507803..ca507803 100644
--- a/test/cases/rlhc.d/case/lmgoto.cpp-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/lmgoto.cpp-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/lmgoto.cpp-C-T0--var-backend.exp b/test/rlhc.d/case/lmgoto.cpp-C-T0--var-backend.exp
index 8bb7f7d0..8bb7f7d0 100644
--- a/test/cases/rlhc.d/case/lmgoto.cpp-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/lmgoto.cpp-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/lmgoto.cpp-C-T0--var-backend.in b/test/rlhc.d/case/lmgoto.cpp-C-T0--var-backend.in
index 15819102..15819102 100644
--- a/test/cases/rlhc.d/case/lmgoto.cpp-C-T0--var-backend.in
+++ b/test/rlhc.d/case/lmgoto.cpp-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/lmgoto.cpp-C-T1--goto-backend.exp b/test/rlhc.d/case/lmgoto.cpp-C-T1--goto-backend.exp
index fb1a4e67..fb1a4e67 100644
--- a/test/cases/rlhc.d/case/lmgoto.cpp-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/lmgoto.cpp-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/lmgoto.cpp-C-T1--goto-backend.in b/test/rlhc.d/case/lmgoto.cpp-C-T1--goto-backend.in
index 0e6b981d..0e6b981d 100644
--- a/test/cases/rlhc.d/case/lmgoto.cpp-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/lmgoto.cpp-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/lmgoto.cpp-C-T1--var-backend.exp b/test/rlhc.d/case/lmgoto.cpp-C-T1--var-backend.exp
index 57d5dfda..57d5dfda 100644
--- a/test/cases/rlhc.d/case/lmgoto.cpp-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/lmgoto.cpp-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/lmgoto.cpp-C-T1--var-backend.in b/test/rlhc.d/case/lmgoto.cpp-C-T1--var-backend.in
index e810ec4a..e810ec4a 100644
--- a/test/cases/rlhc.d/case/lmgoto.cpp-C-T1--var-backend.in
+++ b/test/rlhc.d/case/lmgoto.cpp-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/mailbox1.cpp-C-F0--goto-backend.exp b/test/rlhc.d/case/mailbox1.cpp-C-F0--goto-backend.exp
index daea9f10..daea9f10 100644
--- a/test/cases/rlhc.d/case/mailbox1.cpp-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/mailbox1.cpp-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/mailbox1.cpp-C-F0--goto-backend.in b/test/rlhc.d/case/mailbox1.cpp-C-F0--goto-backend.in
index b5d2c125..b5d2c125 100644
--- a/test/cases/rlhc.d/case/mailbox1.cpp-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/mailbox1.cpp-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/mailbox1.cpp-C-F0--var-backend.exp b/test/rlhc.d/case/mailbox1.cpp-C-F0--var-backend.exp
index b4abebac..b4abebac 100644
--- a/test/cases/rlhc.d/case/mailbox1.cpp-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/mailbox1.cpp-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/mailbox1.cpp-C-F0--var-backend.in b/test/rlhc.d/case/mailbox1.cpp-C-F0--var-backend.in
index fd7df425..fd7df425 100644
--- a/test/cases/rlhc.d/case/mailbox1.cpp-C-F0--var-backend.in
+++ b/test/rlhc.d/case/mailbox1.cpp-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/mailbox1.cpp-C-F1--goto-backend.exp b/test/rlhc.d/case/mailbox1.cpp-C-F1--goto-backend.exp
index 61d6b0c7..61d6b0c7 100644
--- a/test/cases/rlhc.d/case/mailbox1.cpp-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/mailbox1.cpp-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/mailbox1.cpp-C-F1--goto-backend.in b/test/rlhc.d/case/mailbox1.cpp-C-F1--goto-backend.in
index ee64949c..ee64949c 100644
--- a/test/cases/rlhc.d/case/mailbox1.cpp-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/mailbox1.cpp-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/mailbox1.cpp-C-F1--var-backend.exp b/test/rlhc.d/case/mailbox1.cpp-C-F1--var-backend.exp
index acd03074..acd03074 100644
--- a/test/cases/rlhc.d/case/mailbox1.cpp-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/mailbox1.cpp-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/mailbox1.cpp-C-F1--var-backend.in b/test/rlhc.d/case/mailbox1.cpp-C-F1--var-backend.in
index f03de07a..f03de07a 100644
--- a/test/cases/rlhc.d/case/mailbox1.cpp-C-F1--var-backend.in
+++ b/test/rlhc.d/case/mailbox1.cpp-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/mailbox1.cpp-C-G0--goto-backend.exp b/test/rlhc.d/case/mailbox1.cpp-C-G0--goto-backend.exp
index e15936ea..e15936ea 100644
--- a/test/cases/rlhc.d/case/mailbox1.cpp-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/mailbox1.cpp-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/mailbox1.cpp-C-G0--goto-backend.in b/test/rlhc.d/case/mailbox1.cpp-C-G0--goto-backend.in
index 1b87ea4f..1b87ea4f 100644
--- a/test/cases/rlhc.d/case/mailbox1.cpp-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/mailbox1.cpp-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/mailbox1.cpp-C-G1--goto-backend.exp b/test/rlhc.d/case/mailbox1.cpp-C-G1--goto-backend.exp
index 50424c2e..50424c2e 100644
--- a/test/cases/rlhc.d/case/mailbox1.cpp-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/mailbox1.cpp-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/mailbox1.cpp-C-G1--goto-backend.in b/test/rlhc.d/case/mailbox1.cpp-C-G1--goto-backend.in
index 6458ac20..6458ac20 100644
--- a/test/cases/rlhc.d/case/mailbox1.cpp-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/mailbox1.cpp-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/mailbox1.cpp-C-G2--goto-backend.exp b/test/rlhc.d/case/mailbox1.cpp-C-G2--goto-backend.exp
index 8b095bb5..8b095bb5 100644
--- a/test/cases/rlhc.d/case/mailbox1.cpp-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/mailbox1.cpp-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/mailbox1.cpp-C-G2--goto-backend.in b/test/rlhc.d/case/mailbox1.cpp-C-G2--goto-backend.in
index 4e7f9e4d..4e7f9e4d 100644
--- a/test/cases/rlhc.d/case/mailbox1.cpp-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/mailbox1.cpp-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/mailbox1.cpp-C-T0--goto-backend.exp b/test/rlhc.d/case/mailbox1.cpp-C-T0--goto-backend.exp
index 1a966bdf..1a966bdf 100644
--- a/test/cases/rlhc.d/case/mailbox1.cpp-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/mailbox1.cpp-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/mailbox1.cpp-C-T0--goto-backend.in b/test/rlhc.d/case/mailbox1.cpp-C-T0--goto-backend.in
index a8243f05..a8243f05 100644
--- a/test/cases/rlhc.d/case/mailbox1.cpp-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/mailbox1.cpp-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/mailbox1.cpp-C-T0--var-backend.exp b/test/rlhc.d/case/mailbox1.cpp-C-T0--var-backend.exp
index 9e47408c..9e47408c 100644
--- a/test/cases/rlhc.d/case/mailbox1.cpp-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/mailbox1.cpp-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/mailbox1.cpp-C-T0--var-backend.in b/test/rlhc.d/case/mailbox1.cpp-C-T0--var-backend.in
index 2a7be49f..2a7be49f 100644
--- a/test/cases/rlhc.d/case/mailbox1.cpp-C-T0--var-backend.in
+++ b/test/rlhc.d/case/mailbox1.cpp-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/mailbox1.cpp-C-T1--goto-backend.exp b/test/rlhc.d/case/mailbox1.cpp-C-T1--goto-backend.exp
index 35b3e2d0..35b3e2d0 100644
--- a/test/cases/rlhc.d/case/mailbox1.cpp-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/mailbox1.cpp-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/mailbox1.cpp-C-T1--goto-backend.in b/test/rlhc.d/case/mailbox1.cpp-C-T1--goto-backend.in
index 729e8509..729e8509 100644
--- a/test/cases/rlhc.d/case/mailbox1.cpp-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/mailbox1.cpp-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/mailbox1.cpp-C-T1--var-backend.exp b/test/rlhc.d/case/mailbox1.cpp-C-T1--var-backend.exp
index 1367b854..1367b854 100644
--- a/test/cases/rlhc.d/case/mailbox1.cpp-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/mailbox1.cpp-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/mailbox1.cpp-C-T1--var-backend.in b/test/rlhc.d/case/mailbox1.cpp-C-T1--var-backend.in
index 655b82e6..655b82e6 100644
--- a/test/cases/rlhc.d/case/mailbox1.cpp-C-T1--var-backend.in
+++ b/test/rlhc.d/case/mailbox1.cpp-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/mailbox2.cpp-C-F0--goto-backend.exp b/test/rlhc.d/case/mailbox2.cpp-C-F0--goto-backend.exp
index f31472cc..f31472cc 100644
--- a/test/cases/rlhc.d/case/mailbox2.cpp-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/mailbox2.cpp-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/mailbox2.cpp-C-F0--goto-backend.in b/test/rlhc.d/case/mailbox2.cpp-C-F0--goto-backend.in
index ddd543e5..ddd543e5 100644
--- a/test/cases/rlhc.d/case/mailbox2.cpp-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/mailbox2.cpp-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/mailbox2.cpp-C-F0--var-backend.exp b/test/rlhc.d/case/mailbox2.cpp-C-F0--var-backend.exp
index f2e91d80..f2e91d80 100644
--- a/test/cases/rlhc.d/case/mailbox2.cpp-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/mailbox2.cpp-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/mailbox2.cpp-C-F0--var-backend.in b/test/rlhc.d/case/mailbox2.cpp-C-F0--var-backend.in
index d6d9fa81..d6d9fa81 100644
--- a/test/cases/rlhc.d/case/mailbox2.cpp-C-F0--var-backend.in
+++ b/test/rlhc.d/case/mailbox2.cpp-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/mailbox2.cpp-C-F1--goto-backend.exp b/test/rlhc.d/case/mailbox2.cpp-C-F1--goto-backend.exp
index 6db2b7db..6db2b7db 100644
--- a/test/cases/rlhc.d/case/mailbox2.cpp-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/mailbox2.cpp-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/mailbox2.cpp-C-F1--goto-backend.in b/test/rlhc.d/case/mailbox2.cpp-C-F1--goto-backend.in
index 2008ba4b..2008ba4b 100644
--- a/test/cases/rlhc.d/case/mailbox2.cpp-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/mailbox2.cpp-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/mailbox2.cpp-C-F1--var-backend.exp b/test/rlhc.d/case/mailbox2.cpp-C-F1--var-backend.exp
index 52ee9eec..52ee9eec 100644
--- a/test/cases/rlhc.d/case/mailbox2.cpp-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/mailbox2.cpp-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/mailbox2.cpp-C-F1--var-backend.in b/test/rlhc.d/case/mailbox2.cpp-C-F1--var-backend.in
index 66071d32..66071d32 100644
--- a/test/cases/rlhc.d/case/mailbox2.cpp-C-F1--var-backend.in
+++ b/test/rlhc.d/case/mailbox2.cpp-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/mailbox2.cpp-C-G0--goto-backend.exp b/test/rlhc.d/case/mailbox2.cpp-C-G0--goto-backend.exp
index 4496af39..4496af39 100644
--- a/test/cases/rlhc.d/case/mailbox2.cpp-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/mailbox2.cpp-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/mailbox2.cpp-C-G0--goto-backend.in b/test/rlhc.d/case/mailbox2.cpp-C-G0--goto-backend.in
index 799e1609..799e1609 100644
--- a/test/cases/rlhc.d/case/mailbox2.cpp-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/mailbox2.cpp-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/mailbox2.cpp-C-G1--goto-backend.exp b/test/rlhc.d/case/mailbox2.cpp-C-G1--goto-backend.exp
index 694571b2..694571b2 100644
--- a/test/cases/rlhc.d/case/mailbox2.cpp-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/mailbox2.cpp-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/mailbox2.cpp-C-G1--goto-backend.in b/test/rlhc.d/case/mailbox2.cpp-C-G1--goto-backend.in
index e98fb7e1..e98fb7e1 100644
--- a/test/cases/rlhc.d/case/mailbox2.cpp-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/mailbox2.cpp-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/mailbox2.cpp-C-G2--goto-backend.exp b/test/rlhc.d/case/mailbox2.cpp-C-G2--goto-backend.exp
index 77a96885..77a96885 100644
--- a/test/cases/rlhc.d/case/mailbox2.cpp-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/mailbox2.cpp-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/mailbox2.cpp-C-G2--goto-backend.in b/test/rlhc.d/case/mailbox2.cpp-C-G2--goto-backend.in
index 8d549605..8d549605 100644
--- a/test/cases/rlhc.d/case/mailbox2.cpp-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/mailbox2.cpp-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/mailbox2.cpp-C-T0--goto-backend.exp b/test/rlhc.d/case/mailbox2.cpp-C-T0--goto-backend.exp
index 1e30039d..1e30039d 100644
--- a/test/cases/rlhc.d/case/mailbox2.cpp-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/mailbox2.cpp-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/mailbox2.cpp-C-T0--goto-backend.in b/test/rlhc.d/case/mailbox2.cpp-C-T0--goto-backend.in
index 2ca781ca..2ca781ca 100644
--- a/test/cases/rlhc.d/case/mailbox2.cpp-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/mailbox2.cpp-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/mailbox2.cpp-C-T0--var-backend.exp b/test/rlhc.d/case/mailbox2.cpp-C-T0--var-backend.exp
index a8d357e5..a8d357e5 100644
--- a/test/cases/rlhc.d/case/mailbox2.cpp-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/mailbox2.cpp-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/mailbox2.cpp-C-T0--var-backend.in b/test/rlhc.d/case/mailbox2.cpp-C-T0--var-backend.in
index 812a99ac..812a99ac 100644
--- a/test/cases/rlhc.d/case/mailbox2.cpp-C-T0--var-backend.in
+++ b/test/rlhc.d/case/mailbox2.cpp-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/mailbox2.cpp-C-T1--goto-backend.exp b/test/rlhc.d/case/mailbox2.cpp-C-T1--goto-backend.exp
index 65563726..65563726 100644
--- a/test/cases/rlhc.d/case/mailbox2.cpp-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/mailbox2.cpp-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/mailbox2.cpp-C-T1--goto-backend.in b/test/rlhc.d/case/mailbox2.cpp-C-T1--goto-backend.in
index 6fba6530..6fba6530 100644
--- a/test/cases/rlhc.d/case/mailbox2.cpp-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/mailbox2.cpp-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/mailbox2.cpp-C-T1--var-backend.exp b/test/rlhc.d/case/mailbox2.cpp-C-T1--var-backend.exp
index bc754c87..bc754c87 100644
--- a/test/cases/rlhc.d/case/mailbox2.cpp-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/mailbox2.cpp-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/mailbox2.cpp-C-T1--var-backend.in b/test/rlhc.d/case/mailbox2.cpp-C-T1--var-backend.in
index 58ebcbb7..58ebcbb7 100644
--- a/test/cases/rlhc.d/case/mailbox2.cpp-C-T1--var-backend.in
+++ b/test/rlhc.d/case/mailbox2.cpp-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/mailbox3.cpp-C-F0--goto-backend.exp b/test/rlhc.d/case/mailbox3.cpp-C-F0--goto-backend.exp
index 6bbceb67..6bbceb67 100644
--- a/test/cases/rlhc.d/case/mailbox3.cpp-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/mailbox3.cpp-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/mailbox3.cpp-C-F0--goto-backend.in b/test/rlhc.d/case/mailbox3.cpp-C-F0--goto-backend.in
index db18457d..db18457d 100644
--- a/test/cases/rlhc.d/case/mailbox3.cpp-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/mailbox3.cpp-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/mailbox3.cpp-C-F0--var-backend.exp b/test/rlhc.d/case/mailbox3.cpp-C-F0--var-backend.exp
index a93e0db9..a93e0db9 100644
--- a/test/cases/rlhc.d/case/mailbox3.cpp-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/mailbox3.cpp-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/mailbox3.cpp-C-F0--var-backend.in b/test/rlhc.d/case/mailbox3.cpp-C-F0--var-backend.in
index e5eaff8d..e5eaff8d 100644
--- a/test/cases/rlhc.d/case/mailbox3.cpp-C-F0--var-backend.in
+++ b/test/rlhc.d/case/mailbox3.cpp-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/mailbox3.cpp-C-F1--goto-backend.exp b/test/rlhc.d/case/mailbox3.cpp-C-F1--goto-backend.exp
index 2f3a171d..2f3a171d 100644
--- a/test/cases/rlhc.d/case/mailbox3.cpp-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/mailbox3.cpp-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/mailbox3.cpp-C-F1--goto-backend.in b/test/rlhc.d/case/mailbox3.cpp-C-F1--goto-backend.in
index f02a8416..f02a8416 100644
--- a/test/cases/rlhc.d/case/mailbox3.cpp-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/mailbox3.cpp-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/mailbox3.cpp-C-F1--var-backend.exp b/test/rlhc.d/case/mailbox3.cpp-C-F1--var-backend.exp
index d49a0eb5..d49a0eb5 100644
--- a/test/cases/rlhc.d/case/mailbox3.cpp-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/mailbox3.cpp-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/mailbox3.cpp-C-F1--var-backend.in b/test/rlhc.d/case/mailbox3.cpp-C-F1--var-backend.in
index d70d588b..d70d588b 100644
--- a/test/cases/rlhc.d/case/mailbox3.cpp-C-F1--var-backend.in
+++ b/test/rlhc.d/case/mailbox3.cpp-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/mailbox3.cpp-C-G0--goto-backend.exp b/test/rlhc.d/case/mailbox3.cpp-C-G0--goto-backend.exp
index 3e31d68f..3e31d68f 100644
--- a/test/cases/rlhc.d/case/mailbox3.cpp-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/mailbox3.cpp-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/mailbox3.cpp-C-G0--goto-backend.in b/test/rlhc.d/case/mailbox3.cpp-C-G0--goto-backend.in
index 128be048..128be048 100644
--- a/test/cases/rlhc.d/case/mailbox3.cpp-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/mailbox3.cpp-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/mailbox3.cpp-C-G1--goto-backend.exp b/test/rlhc.d/case/mailbox3.cpp-C-G1--goto-backend.exp
index 8a1aab51..8a1aab51 100644
--- a/test/cases/rlhc.d/case/mailbox3.cpp-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/mailbox3.cpp-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/mailbox3.cpp-C-G1--goto-backend.in b/test/rlhc.d/case/mailbox3.cpp-C-G1--goto-backend.in
index a929cb5a..a929cb5a 100644
--- a/test/cases/rlhc.d/case/mailbox3.cpp-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/mailbox3.cpp-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/mailbox3.cpp-C-G2--goto-backend.exp b/test/rlhc.d/case/mailbox3.cpp-C-G2--goto-backend.exp
index 167da9ca..167da9ca 100644
--- a/test/cases/rlhc.d/case/mailbox3.cpp-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/mailbox3.cpp-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/mailbox3.cpp-C-G2--goto-backend.in b/test/rlhc.d/case/mailbox3.cpp-C-G2--goto-backend.in
index 127c8a6c..127c8a6c 100644
--- a/test/cases/rlhc.d/case/mailbox3.cpp-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/mailbox3.cpp-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/mailbox3.cpp-C-T0--goto-backend.exp b/test/rlhc.d/case/mailbox3.cpp-C-T0--goto-backend.exp
index 0adee890..0adee890 100644
--- a/test/cases/rlhc.d/case/mailbox3.cpp-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/mailbox3.cpp-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/mailbox3.cpp-C-T0--goto-backend.in b/test/rlhc.d/case/mailbox3.cpp-C-T0--goto-backend.in
index 829a5206..829a5206 100644
--- a/test/cases/rlhc.d/case/mailbox3.cpp-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/mailbox3.cpp-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/mailbox3.cpp-C-T0--var-backend.exp b/test/rlhc.d/case/mailbox3.cpp-C-T0--var-backend.exp
index c40153fa..c40153fa 100644
--- a/test/cases/rlhc.d/case/mailbox3.cpp-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/mailbox3.cpp-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/mailbox3.cpp-C-T0--var-backend.in b/test/rlhc.d/case/mailbox3.cpp-C-T0--var-backend.in
index f870ce00..f870ce00 100644
--- a/test/cases/rlhc.d/case/mailbox3.cpp-C-T0--var-backend.in
+++ b/test/rlhc.d/case/mailbox3.cpp-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/mailbox3.cpp-C-T1--goto-backend.exp b/test/rlhc.d/case/mailbox3.cpp-C-T1--goto-backend.exp
index 95338858..95338858 100644
--- a/test/cases/rlhc.d/case/mailbox3.cpp-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/mailbox3.cpp-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/mailbox3.cpp-C-T1--goto-backend.in b/test/rlhc.d/case/mailbox3.cpp-C-T1--goto-backend.in
index 1219a110..1219a110 100644
--- a/test/cases/rlhc.d/case/mailbox3.cpp-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/mailbox3.cpp-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/mailbox3.cpp-C-T1--var-backend.exp b/test/rlhc.d/case/mailbox3.cpp-C-T1--var-backend.exp
index 2320f4ac..2320f4ac 100644
--- a/test/cases/rlhc.d/case/mailbox3.cpp-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/mailbox3.cpp-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/mailbox3.cpp-C-T1--var-backend.in b/test/rlhc.d/case/mailbox3.cpp-C-T1--var-backend.in
index b5e32692..b5e32692 100644
--- a/test/cases/rlhc.d/case/mailbox3.cpp-C-T1--var-backend.in
+++ b/test/rlhc.d/case/mailbox3.cpp-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/minimize1.c-C-F0--goto-backend.exp b/test/rlhc.d/case/minimize1.c-C-F0--goto-backend.exp
index 1252e463..1252e463 100644
--- a/test/cases/rlhc.d/case/minimize1.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/minimize1.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/minimize1.c-C-F0--goto-backend.in b/test/rlhc.d/case/minimize1.c-C-F0--goto-backend.in
index d3483353..d3483353 100644
--- a/test/cases/rlhc.d/case/minimize1.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/minimize1.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/minimize1.c-C-F0--var-backend.exp b/test/rlhc.d/case/minimize1.c-C-F0--var-backend.exp
index 92e91f67..92e91f67 100644
--- a/test/cases/rlhc.d/case/minimize1.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/minimize1.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/minimize1.c-C-F0--var-backend.in b/test/rlhc.d/case/minimize1.c-C-F0--var-backend.in
index bd9aa6bc..bd9aa6bc 100644
--- a/test/cases/rlhc.d/case/minimize1.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/minimize1.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/minimize1.c-C-F1--goto-backend.exp b/test/rlhc.d/case/minimize1.c-C-F1--goto-backend.exp
index a2f7d49f..a2f7d49f 100644
--- a/test/cases/rlhc.d/case/minimize1.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/minimize1.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/minimize1.c-C-F1--goto-backend.in b/test/rlhc.d/case/minimize1.c-C-F1--goto-backend.in
index 6db9605c..6db9605c 100644
--- a/test/cases/rlhc.d/case/minimize1.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/minimize1.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/minimize1.c-C-F1--var-backend.exp b/test/rlhc.d/case/minimize1.c-C-F1--var-backend.exp
index 44f6a15c..44f6a15c 100644
--- a/test/cases/rlhc.d/case/minimize1.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/minimize1.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/minimize1.c-C-F1--var-backend.in b/test/rlhc.d/case/minimize1.c-C-F1--var-backend.in
index 7139adfb..7139adfb 100644
--- a/test/cases/rlhc.d/case/minimize1.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/minimize1.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/minimize1.c-C-G0--goto-backend.exp b/test/rlhc.d/case/minimize1.c-C-G0--goto-backend.exp
index c4df2a65..c4df2a65 100644
--- a/test/cases/rlhc.d/case/minimize1.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/minimize1.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/minimize1.c-C-G0--goto-backend.in b/test/rlhc.d/case/minimize1.c-C-G0--goto-backend.in
index e792b315..e792b315 100644
--- a/test/cases/rlhc.d/case/minimize1.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/minimize1.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/minimize1.c-C-G1--goto-backend.exp b/test/rlhc.d/case/minimize1.c-C-G1--goto-backend.exp
index b0ce193f..b0ce193f 100644
--- a/test/cases/rlhc.d/case/minimize1.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/minimize1.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/minimize1.c-C-G1--goto-backend.in b/test/rlhc.d/case/minimize1.c-C-G1--goto-backend.in
index a98fafa5..a98fafa5 100644
--- a/test/cases/rlhc.d/case/minimize1.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/minimize1.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/minimize1.c-C-G2--goto-backend.exp b/test/rlhc.d/case/minimize1.c-C-G2--goto-backend.exp
index 07b83663..07b83663 100644
--- a/test/cases/rlhc.d/case/minimize1.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/minimize1.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/minimize1.c-C-G2--goto-backend.in b/test/rlhc.d/case/minimize1.c-C-G2--goto-backend.in
index e2eaf6d5..e2eaf6d5 100644
--- a/test/cases/rlhc.d/case/minimize1.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/minimize1.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/minimize1.c-C-T0--goto-backend.exp b/test/rlhc.d/case/minimize1.c-C-T0--goto-backend.exp
index 5622d29e..5622d29e 100644
--- a/test/cases/rlhc.d/case/minimize1.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/minimize1.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/minimize1.c-C-T0--goto-backend.in b/test/rlhc.d/case/minimize1.c-C-T0--goto-backend.in
index 90dbb6fb..90dbb6fb 100644
--- a/test/cases/rlhc.d/case/minimize1.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/minimize1.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/minimize1.c-C-T0--var-backend.exp b/test/rlhc.d/case/minimize1.c-C-T0--var-backend.exp
index 140eb58d..140eb58d 100644
--- a/test/cases/rlhc.d/case/minimize1.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/minimize1.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/minimize1.c-C-T0--var-backend.in b/test/rlhc.d/case/minimize1.c-C-T0--var-backend.in
index f650e71c..f650e71c 100644
--- a/test/cases/rlhc.d/case/minimize1.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/minimize1.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/minimize1.c-C-T1--goto-backend.exp b/test/rlhc.d/case/minimize1.c-C-T1--goto-backend.exp
index 1f4fb3db..1f4fb3db 100644
--- a/test/cases/rlhc.d/case/minimize1.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/minimize1.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/minimize1.c-C-T1--goto-backend.in b/test/rlhc.d/case/minimize1.c-C-T1--goto-backend.in
index b1cfe028..b1cfe028 100644
--- a/test/cases/rlhc.d/case/minimize1.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/minimize1.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/minimize1.c-C-T1--var-backend.exp b/test/rlhc.d/case/minimize1.c-C-T1--var-backend.exp
index a72ba178..a72ba178 100644
--- a/test/cases/rlhc.d/case/minimize1.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/minimize1.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/minimize1.c-C-T1--var-backend.in b/test/rlhc.d/case/minimize1.c-C-T1--var-backend.in
index 81d5d5a0..81d5d5a0 100644
--- a/test/cases/rlhc.d/case/minimize1.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/minimize1.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_c.c-C-F0--goto-backend.exp b/test/rlhc.d/case/ncall1_c.c-C-F0--goto-backend.exp
index 34d7fbc0..34d7fbc0 100644
--- a/test/cases/rlhc.d/case/ncall1_c.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/ncall1_c.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_c.c-C-F0--goto-backend.in b/test/rlhc.d/case/ncall1_c.c-C-F0--goto-backend.in
index f1b10235..f1b10235 100644
--- a/test/cases/rlhc.d/case/ncall1_c.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/ncall1_c.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_c.c-C-F0--var-backend.exp b/test/rlhc.d/case/ncall1_c.c-C-F0--var-backend.exp
index 1235e774..1235e774 100644
--- a/test/cases/rlhc.d/case/ncall1_c.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/ncall1_c.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_c.c-C-F0--var-backend.in b/test/rlhc.d/case/ncall1_c.c-C-F0--var-backend.in
index d7a2448d..d7a2448d 100644
--- a/test/cases/rlhc.d/case/ncall1_c.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/ncall1_c.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_c.c-C-F1--goto-backend.exp b/test/rlhc.d/case/ncall1_c.c-C-F1--goto-backend.exp
index 56a5ea5e..56a5ea5e 100644
--- a/test/cases/rlhc.d/case/ncall1_c.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/ncall1_c.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_c.c-C-F1--goto-backend.in b/test/rlhc.d/case/ncall1_c.c-C-F1--goto-backend.in
index 3ad0df88..3ad0df88 100644
--- a/test/cases/rlhc.d/case/ncall1_c.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/ncall1_c.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_c.c-C-F1--var-backend.exp b/test/rlhc.d/case/ncall1_c.c-C-F1--var-backend.exp
index 8b1dce07..8b1dce07 100644
--- a/test/cases/rlhc.d/case/ncall1_c.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/ncall1_c.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_c.c-C-F1--var-backend.in b/test/rlhc.d/case/ncall1_c.c-C-F1--var-backend.in
index bb61ec09..bb61ec09 100644
--- a/test/cases/rlhc.d/case/ncall1_c.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/ncall1_c.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_c.c-C-G0--goto-backend.exp b/test/rlhc.d/case/ncall1_c.c-C-G0--goto-backend.exp
index 5410161e..5410161e 100644
--- a/test/cases/rlhc.d/case/ncall1_c.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/ncall1_c.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_c.c-C-G0--goto-backend.in b/test/rlhc.d/case/ncall1_c.c-C-G0--goto-backend.in
index 84f237dc..84f237dc 100644
--- a/test/cases/rlhc.d/case/ncall1_c.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/ncall1_c.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_c.c-C-G1--goto-backend.exp b/test/rlhc.d/case/ncall1_c.c-C-G1--goto-backend.exp
index fa050235..fa050235 100644
--- a/test/cases/rlhc.d/case/ncall1_c.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/ncall1_c.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_c.c-C-G1--goto-backend.in b/test/rlhc.d/case/ncall1_c.c-C-G1--goto-backend.in
index 038c7ee8..038c7ee8 100644
--- a/test/cases/rlhc.d/case/ncall1_c.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/ncall1_c.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_c.c-C-G2--goto-backend.exp b/test/rlhc.d/case/ncall1_c.c-C-G2--goto-backend.exp
index 75b2a585..75b2a585 100644
--- a/test/cases/rlhc.d/case/ncall1_c.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/ncall1_c.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_c.c-C-G2--goto-backend.in b/test/rlhc.d/case/ncall1_c.c-C-G2--goto-backend.in
index 30ed6560..30ed6560 100644
--- a/test/cases/rlhc.d/case/ncall1_c.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/ncall1_c.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_c.c-C-T0--goto-backend.exp b/test/rlhc.d/case/ncall1_c.c-C-T0--goto-backend.exp
index 606d79fa..606d79fa 100644
--- a/test/cases/rlhc.d/case/ncall1_c.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/ncall1_c.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_c.c-C-T0--goto-backend.in b/test/rlhc.d/case/ncall1_c.c-C-T0--goto-backend.in
index fe6977d7..fe6977d7 100644
--- a/test/cases/rlhc.d/case/ncall1_c.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/ncall1_c.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_c.c-C-T0--var-backend.exp b/test/rlhc.d/case/ncall1_c.c-C-T0--var-backend.exp
index ec14bf7c..ec14bf7c 100644
--- a/test/cases/rlhc.d/case/ncall1_c.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/ncall1_c.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_c.c-C-T0--var-backend.in b/test/rlhc.d/case/ncall1_c.c-C-T0--var-backend.in
index c2ce21d1..c2ce21d1 100644
--- a/test/cases/rlhc.d/case/ncall1_c.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/ncall1_c.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_c.c-C-T1--goto-backend.exp b/test/rlhc.d/case/ncall1_c.c-C-T1--goto-backend.exp
index 438f5d29..438f5d29 100644
--- a/test/cases/rlhc.d/case/ncall1_c.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/ncall1_c.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_c.c-C-T1--goto-backend.in b/test/rlhc.d/case/ncall1_c.c-C-T1--goto-backend.in
index dfbf8976..dfbf8976 100644
--- a/test/cases/rlhc.d/case/ncall1_c.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/ncall1_c.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_c.c-C-T1--var-backend.exp b/test/rlhc.d/case/ncall1_c.c-C-T1--var-backend.exp
index a59eb8a5..a59eb8a5 100644
--- a/test/cases/rlhc.d/case/ncall1_c.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/ncall1_c.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_c.c-C-T1--var-backend.in b/test/rlhc.d/case/ncall1_c.c-C-T1--var-backend.in
index 55ceebbe..55ceebbe 100644
--- a/test/cases/rlhc.d/case/ncall1_c.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/ncall1_c.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_crack.crk-K-F0--var-backend.exp b/test/rlhc.d/case/ncall1_crack.crk-K-F0--var-backend.exp
index fc7a6921..fc7a6921 100644
--- a/test/cases/rlhc.d/case/ncall1_crack.crk-K-F0--var-backend.exp
+++ b/test/rlhc.d/case/ncall1_crack.crk-K-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_crack.crk-K-F0--var-backend.in b/test/rlhc.d/case/ncall1_crack.crk-K-F0--var-backend.in
index 67a109a7..67a109a7 100644
--- a/test/cases/rlhc.d/case/ncall1_crack.crk-K-F0--var-backend.in
+++ b/test/rlhc.d/case/ncall1_crack.crk-K-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_crack.crk-K-F1--var-backend.exp b/test/rlhc.d/case/ncall1_crack.crk-K-F1--var-backend.exp
index 675ceb62..675ceb62 100644
--- a/test/cases/rlhc.d/case/ncall1_crack.crk-K-F1--var-backend.exp
+++ b/test/rlhc.d/case/ncall1_crack.crk-K-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_crack.crk-K-F1--var-backend.in b/test/rlhc.d/case/ncall1_crack.crk-K-F1--var-backend.in
index 6ba6c359..6ba6c359 100644
--- a/test/cases/rlhc.d/case/ncall1_crack.crk-K-F1--var-backend.in
+++ b/test/rlhc.d/case/ncall1_crack.crk-K-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_crack.crk-K-T0--var-backend.exp b/test/rlhc.d/case/ncall1_crack.crk-K-T0--var-backend.exp
index fbdef522..fbdef522 100644
--- a/test/cases/rlhc.d/case/ncall1_crack.crk-K-T0--var-backend.exp
+++ b/test/rlhc.d/case/ncall1_crack.crk-K-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_crack.crk-K-T0--var-backend.in b/test/rlhc.d/case/ncall1_crack.crk-K-T0--var-backend.in
index d6d46578..d6d46578 100644
--- a/test/cases/rlhc.d/case/ncall1_crack.crk-K-T0--var-backend.in
+++ b/test/rlhc.d/case/ncall1_crack.crk-K-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_crack.crk-K-T1--var-backend.exp b/test/rlhc.d/case/ncall1_crack.crk-K-T1--var-backend.exp
index 9b844fba..9b844fba 100644
--- a/test/cases/rlhc.d/case/ncall1_crack.crk-K-T1--var-backend.exp
+++ b/test/rlhc.d/case/ncall1_crack.crk-K-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_crack.crk-K-T1--var-backend.in b/test/rlhc.d/case/ncall1_crack.crk-K-T1--var-backend.in
index 6ae3fede..6ae3fede 100644
--- a/test/cases/rlhc.d/case/ncall1_crack.crk-K-T1--var-backend.in
+++ b/test/rlhc.d/case/ncall1_crack.crk-K-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_cs.cs-A-F0--goto-backend.exp b/test/rlhc.d/case/ncall1_cs.cs-A-F0--goto-backend.exp
index e0a6abad..e0a6abad 100644
--- a/test/cases/rlhc.d/case/ncall1_cs.cs-A-F0--goto-backend.exp
+++ b/test/rlhc.d/case/ncall1_cs.cs-A-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_cs.cs-A-F0--goto-backend.in b/test/rlhc.d/case/ncall1_cs.cs-A-F0--goto-backend.in
index 67debd52..67debd52 100644
--- a/test/cases/rlhc.d/case/ncall1_cs.cs-A-F0--goto-backend.in
+++ b/test/rlhc.d/case/ncall1_cs.cs-A-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_cs.cs-A-F0--var-backend.exp b/test/rlhc.d/case/ncall1_cs.cs-A-F0--var-backend.exp
index 9cd485e0..9cd485e0 100644
--- a/test/cases/rlhc.d/case/ncall1_cs.cs-A-F0--var-backend.exp
+++ b/test/rlhc.d/case/ncall1_cs.cs-A-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_cs.cs-A-F0--var-backend.in b/test/rlhc.d/case/ncall1_cs.cs-A-F0--var-backend.in
index 64df7502..64df7502 100644
--- a/test/cases/rlhc.d/case/ncall1_cs.cs-A-F0--var-backend.in
+++ b/test/rlhc.d/case/ncall1_cs.cs-A-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_cs.cs-A-F1--goto-backend.exp b/test/rlhc.d/case/ncall1_cs.cs-A-F1--goto-backend.exp
index c579e200..c579e200 100644
--- a/test/cases/rlhc.d/case/ncall1_cs.cs-A-F1--goto-backend.exp
+++ b/test/rlhc.d/case/ncall1_cs.cs-A-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_cs.cs-A-F1--goto-backend.in b/test/rlhc.d/case/ncall1_cs.cs-A-F1--goto-backend.in
index c78d859e..c78d859e 100644
--- a/test/cases/rlhc.d/case/ncall1_cs.cs-A-F1--goto-backend.in
+++ b/test/rlhc.d/case/ncall1_cs.cs-A-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_cs.cs-A-F1--var-backend.exp b/test/rlhc.d/case/ncall1_cs.cs-A-F1--var-backend.exp
index 7d6715bb..7d6715bb 100644
--- a/test/cases/rlhc.d/case/ncall1_cs.cs-A-F1--var-backend.exp
+++ b/test/rlhc.d/case/ncall1_cs.cs-A-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_cs.cs-A-F1--var-backend.in b/test/rlhc.d/case/ncall1_cs.cs-A-F1--var-backend.in
index 9a7e629a..9a7e629a 100644
--- a/test/cases/rlhc.d/case/ncall1_cs.cs-A-F1--var-backend.in
+++ b/test/rlhc.d/case/ncall1_cs.cs-A-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_cs.cs-A-G0--goto-backend.exp b/test/rlhc.d/case/ncall1_cs.cs-A-G0--goto-backend.exp
index 6fa73f4b..6fa73f4b 100644
--- a/test/cases/rlhc.d/case/ncall1_cs.cs-A-G0--goto-backend.exp
+++ b/test/rlhc.d/case/ncall1_cs.cs-A-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_cs.cs-A-G0--goto-backend.in b/test/rlhc.d/case/ncall1_cs.cs-A-G0--goto-backend.in
index bbfa4e2e..bbfa4e2e 100644
--- a/test/cases/rlhc.d/case/ncall1_cs.cs-A-G0--goto-backend.in
+++ b/test/rlhc.d/case/ncall1_cs.cs-A-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_cs.cs-A-G1--goto-backend.exp b/test/rlhc.d/case/ncall1_cs.cs-A-G1--goto-backend.exp
index 9192648f..9192648f 100644
--- a/test/cases/rlhc.d/case/ncall1_cs.cs-A-G1--goto-backend.exp
+++ b/test/rlhc.d/case/ncall1_cs.cs-A-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_cs.cs-A-G1--goto-backend.in b/test/rlhc.d/case/ncall1_cs.cs-A-G1--goto-backend.in
index 1cdb9dcc..1cdb9dcc 100644
--- a/test/cases/rlhc.d/case/ncall1_cs.cs-A-G1--goto-backend.in
+++ b/test/rlhc.d/case/ncall1_cs.cs-A-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_cs.cs-A-T0--goto-backend.exp b/test/rlhc.d/case/ncall1_cs.cs-A-T0--goto-backend.exp
index 07768c97..07768c97 100644
--- a/test/cases/rlhc.d/case/ncall1_cs.cs-A-T0--goto-backend.exp
+++ b/test/rlhc.d/case/ncall1_cs.cs-A-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_cs.cs-A-T0--goto-backend.in b/test/rlhc.d/case/ncall1_cs.cs-A-T0--goto-backend.in
index f7da79e2..f7da79e2 100644
--- a/test/cases/rlhc.d/case/ncall1_cs.cs-A-T0--goto-backend.in
+++ b/test/rlhc.d/case/ncall1_cs.cs-A-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_cs.cs-A-T0--var-backend.exp b/test/rlhc.d/case/ncall1_cs.cs-A-T0--var-backend.exp
index 2f956c3e..2f956c3e 100644
--- a/test/cases/rlhc.d/case/ncall1_cs.cs-A-T0--var-backend.exp
+++ b/test/rlhc.d/case/ncall1_cs.cs-A-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_cs.cs-A-T0--var-backend.in b/test/rlhc.d/case/ncall1_cs.cs-A-T0--var-backend.in
index 7592ac88..7592ac88 100644
--- a/test/cases/rlhc.d/case/ncall1_cs.cs-A-T0--var-backend.in
+++ b/test/rlhc.d/case/ncall1_cs.cs-A-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_cs.cs-A-T1--goto-backend.exp b/test/rlhc.d/case/ncall1_cs.cs-A-T1--goto-backend.exp
index 4a790dd4..4a790dd4 100644
--- a/test/cases/rlhc.d/case/ncall1_cs.cs-A-T1--goto-backend.exp
+++ b/test/rlhc.d/case/ncall1_cs.cs-A-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_cs.cs-A-T1--goto-backend.in b/test/rlhc.d/case/ncall1_cs.cs-A-T1--goto-backend.in
index fd377387..fd377387 100644
--- a/test/cases/rlhc.d/case/ncall1_cs.cs-A-T1--goto-backend.in
+++ b/test/rlhc.d/case/ncall1_cs.cs-A-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_cs.cs-A-T1--var-backend.exp b/test/rlhc.d/case/ncall1_cs.cs-A-T1--var-backend.exp
index 8962319f..8962319f 100644
--- a/test/cases/rlhc.d/case/ncall1_cs.cs-A-T1--var-backend.exp
+++ b/test/rlhc.d/case/ncall1_cs.cs-A-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_cs.cs-A-T1--var-backend.in b/test/rlhc.d/case/ncall1_cs.cs-A-T1--var-backend.in
index d2c915a6..d2c915a6 100644
--- a/test/cases/rlhc.d/case/ncall1_cs.cs-A-T1--var-backend.in
+++ b/test/rlhc.d/case/ncall1_cs.cs-A-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_go.go-Z-F0--goto-backend.exp b/test/rlhc.d/case/ncall1_go.go-Z-F0--goto-backend.exp
index 11a4efaf..11a4efaf 100644
--- a/test/cases/rlhc.d/case/ncall1_go.go-Z-F0--goto-backend.exp
+++ b/test/rlhc.d/case/ncall1_go.go-Z-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_go.go-Z-F0--goto-backend.in b/test/rlhc.d/case/ncall1_go.go-Z-F0--goto-backend.in
index 26a439b2..26a439b2 100644
--- a/test/cases/rlhc.d/case/ncall1_go.go-Z-F0--goto-backend.in
+++ b/test/rlhc.d/case/ncall1_go.go-Z-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_go.go-Z-F0--var-backend.exp b/test/rlhc.d/case/ncall1_go.go-Z-F0--var-backend.exp
index ae595fc4..ae595fc4 100644
--- a/test/cases/rlhc.d/case/ncall1_go.go-Z-F0--var-backend.exp
+++ b/test/rlhc.d/case/ncall1_go.go-Z-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_go.go-Z-F0--var-backend.in b/test/rlhc.d/case/ncall1_go.go-Z-F0--var-backend.in
index bae8caae..bae8caae 100644
--- a/test/cases/rlhc.d/case/ncall1_go.go-Z-F0--var-backend.in
+++ b/test/rlhc.d/case/ncall1_go.go-Z-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_go.go-Z-F1--goto-backend.exp b/test/rlhc.d/case/ncall1_go.go-Z-F1--goto-backend.exp
index 96121bed..96121bed 100644
--- a/test/cases/rlhc.d/case/ncall1_go.go-Z-F1--goto-backend.exp
+++ b/test/rlhc.d/case/ncall1_go.go-Z-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_go.go-Z-F1--goto-backend.in b/test/rlhc.d/case/ncall1_go.go-Z-F1--goto-backend.in
index e4e4306e..e4e4306e 100644
--- a/test/cases/rlhc.d/case/ncall1_go.go-Z-F1--goto-backend.in
+++ b/test/rlhc.d/case/ncall1_go.go-Z-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_go.go-Z-F1--var-backend.exp b/test/rlhc.d/case/ncall1_go.go-Z-F1--var-backend.exp
index e5edc79f..e5edc79f 100644
--- a/test/cases/rlhc.d/case/ncall1_go.go-Z-F1--var-backend.exp
+++ b/test/rlhc.d/case/ncall1_go.go-Z-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_go.go-Z-F1--var-backend.in b/test/rlhc.d/case/ncall1_go.go-Z-F1--var-backend.in
index a7809103..a7809103 100644
--- a/test/cases/rlhc.d/case/ncall1_go.go-Z-F1--var-backend.in
+++ b/test/rlhc.d/case/ncall1_go.go-Z-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_go.go-Z-G0--goto-backend.exp b/test/rlhc.d/case/ncall1_go.go-Z-G0--goto-backend.exp
index 0af5fef9..0af5fef9 100644
--- a/test/cases/rlhc.d/case/ncall1_go.go-Z-G0--goto-backend.exp
+++ b/test/rlhc.d/case/ncall1_go.go-Z-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_go.go-Z-G0--goto-backend.in b/test/rlhc.d/case/ncall1_go.go-Z-G0--goto-backend.in
index 8e220b45..8e220b45 100644
--- a/test/cases/rlhc.d/case/ncall1_go.go-Z-G0--goto-backend.in
+++ b/test/rlhc.d/case/ncall1_go.go-Z-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_go.go-Z-G1--goto-backend.exp b/test/rlhc.d/case/ncall1_go.go-Z-G1--goto-backend.exp
index cc56ed3e..cc56ed3e 100644
--- a/test/cases/rlhc.d/case/ncall1_go.go-Z-G1--goto-backend.exp
+++ b/test/rlhc.d/case/ncall1_go.go-Z-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_go.go-Z-G1--goto-backend.in b/test/rlhc.d/case/ncall1_go.go-Z-G1--goto-backend.in
index 44409d08..44409d08 100644
--- a/test/cases/rlhc.d/case/ncall1_go.go-Z-G1--goto-backend.in
+++ b/test/rlhc.d/case/ncall1_go.go-Z-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_go.go-Z-G2--goto-backend.exp b/test/rlhc.d/case/ncall1_go.go-Z-G2--goto-backend.exp
index 36aabf6d..36aabf6d 100644
--- a/test/cases/rlhc.d/case/ncall1_go.go-Z-G2--goto-backend.exp
+++ b/test/rlhc.d/case/ncall1_go.go-Z-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_go.go-Z-G2--goto-backend.in b/test/rlhc.d/case/ncall1_go.go-Z-G2--goto-backend.in
index 420db49a..420db49a 100644
--- a/test/cases/rlhc.d/case/ncall1_go.go-Z-G2--goto-backend.in
+++ b/test/rlhc.d/case/ncall1_go.go-Z-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_go.go-Z-T0--goto-backend.exp b/test/rlhc.d/case/ncall1_go.go-Z-T0--goto-backend.exp
index 2b2144b1..2b2144b1 100644
--- a/test/cases/rlhc.d/case/ncall1_go.go-Z-T0--goto-backend.exp
+++ b/test/rlhc.d/case/ncall1_go.go-Z-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_go.go-Z-T0--goto-backend.in b/test/rlhc.d/case/ncall1_go.go-Z-T0--goto-backend.in
index 822e7d9c..822e7d9c 100644
--- a/test/cases/rlhc.d/case/ncall1_go.go-Z-T0--goto-backend.in
+++ b/test/rlhc.d/case/ncall1_go.go-Z-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_go.go-Z-T0--var-backend.exp b/test/rlhc.d/case/ncall1_go.go-Z-T0--var-backend.exp
index 7f63b647..7f63b647 100644
--- a/test/cases/rlhc.d/case/ncall1_go.go-Z-T0--var-backend.exp
+++ b/test/rlhc.d/case/ncall1_go.go-Z-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_go.go-Z-T0--var-backend.in b/test/rlhc.d/case/ncall1_go.go-Z-T0--var-backend.in
index ea948e7b..ea948e7b 100644
--- a/test/cases/rlhc.d/case/ncall1_go.go-Z-T0--var-backend.in
+++ b/test/rlhc.d/case/ncall1_go.go-Z-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_go.go-Z-T1--goto-backend.exp b/test/rlhc.d/case/ncall1_go.go-Z-T1--goto-backend.exp
index 6deb98d0..6deb98d0 100644
--- a/test/cases/rlhc.d/case/ncall1_go.go-Z-T1--goto-backend.exp
+++ b/test/rlhc.d/case/ncall1_go.go-Z-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_go.go-Z-T1--goto-backend.in b/test/rlhc.d/case/ncall1_go.go-Z-T1--goto-backend.in
index 735a439b..735a439b 100644
--- a/test/cases/rlhc.d/case/ncall1_go.go-Z-T1--goto-backend.in
+++ b/test/rlhc.d/case/ncall1_go.go-Z-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_go.go-Z-T1--var-backend.exp b/test/rlhc.d/case/ncall1_go.go-Z-T1--var-backend.exp
index d011a983..d011a983 100644
--- a/test/cases/rlhc.d/case/ncall1_go.go-Z-T1--var-backend.exp
+++ b/test/rlhc.d/case/ncall1_go.go-Z-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_go.go-Z-T1--var-backend.in b/test/rlhc.d/case/ncall1_go.go-Z-T1--var-backend.in
index f317b55f..f317b55f 100644
--- a/test/cases/rlhc.d/case/ncall1_go.go-Z-T1--var-backend.in
+++ b/test/rlhc.d/case/ncall1_go.go-Z-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_java.java-J-F0--goto-backend.exp b/test/rlhc.d/case/ncall1_java.java-J-F0--goto-backend.exp
index 109a78a9..109a78a9 100644
--- a/test/cases/rlhc.d/case/ncall1_java.java-J-F0--goto-backend.exp
+++ b/test/rlhc.d/case/ncall1_java.java-J-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_java.java-J-F0--goto-backend.in b/test/rlhc.d/case/ncall1_java.java-J-F0--goto-backend.in
index dfcebe4b..dfcebe4b 100644
--- a/test/cases/rlhc.d/case/ncall1_java.java-J-F0--goto-backend.in
+++ b/test/rlhc.d/case/ncall1_java.java-J-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_java.java-J-F0--var-backend.exp b/test/rlhc.d/case/ncall1_java.java-J-F0--var-backend.exp
index 5a96a5b5..5a96a5b5 100644
--- a/test/cases/rlhc.d/case/ncall1_java.java-J-F0--var-backend.exp
+++ b/test/rlhc.d/case/ncall1_java.java-J-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_java.java-J-F0--var-backend.in b/test/rlhc.d/case/ncall1_java.java-J-F0--var-backend.in
index 74af8cdc..74af8cdc 100644
--- a/test/cases/rlhc.d/case/ncall1_java.java-J-F0--var-backend.in
+++ b/test/rlhc.d/case/ncall1_java.java-J-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_java.java-J-F1--goto-backend.exp b/test/rlhc.d/case/ncall1_java.java-J-F1--goto-backend.exp
index ab847033..ab847033 100644
--- a/test/cases/rlhc.d/case/ncall1_java.java-J-F1--goto-backend.exp
+++ b/test/rlhc.d/case/ncall1_java.java-J-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_java.java-J-F1--goto-backend.in b/test/rlhc.d/case/ncall1_java.java-J-F1--goto-backend.in
index 710b5431..710b5431 100644
--- a/test/cases/rlhc.d/case/ncall1_java.java-J-F1--goto-backend.in
+++ b/test/rlhc.d/case/ncall1_java.java-J-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_java.java-J-F1--var-backend.exp b/test/rlhc.d/case/ncall1_java.java-J-F1--var-backend.exp
index 60e9edca..60e9edca 100644
--- a/test/cases/rlhc.d/case/ncall1_java.java-J-F1--var-backend.exp
+++ b/test/rlhc.d/case/ncall1_java.java-J-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_java.java-J-F1--var-backend.in b/test/rlhc.d/case/ncall1_java.java-J-F1--var-backend.in
index 7e927686..7e927686 100644
--- a/test/cases/rlhc.d/case/ncall1_java.java-J-F1--var-backend.in
+++ b/test/rlhc.d/case/ncall1_java.java-J-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_java.java-J-T0--goto-backend.exp b/test/rlhc.d/case/ncall1_java.java-J-T0--goto-backend.exp
index a70ddb31..a70ddb31 100644
--- a/test/cases/rlhc.d/case/ncall1_java.java-J-T0--goto-backend.exp
+++ b/test/rlhc.d/case/ncall1_java.java-J-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_java.java-J-T0--goto-backend.in b/test/rlhc.d/case/ncall1_java.java-J-T0--goto-backend.in
index a21e15bf..a21e15bf 100644
--- a/test/cases/rlhc.d/case/ncall1_java.java-J-T0--goto-backend.in
+++ b/test/rlhc.d/case/ncall1_java.java-J-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_java.java-J-T0--var-backend.exp b/test/rlhc.d/case/ncall1_java.java-J-T0--var-backend.exp
index 39baeef1..39baeef1 100644
--- a/test/cases/rlhc.d/case/ncall1_java.java-J-T0--var-backend.exp
+++ b/test/rlhc.d/case/ncall1_java.java-J-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_java.java-J-T0--var-backend.in b/test/rlhc.d/case/ncall1_java.java-J-T0--var-backend.in
index fc28f0ef..fc28f0ef 100644
--- a/test/cases/rlhc.d/case/ncall1_java.java-J-T0--var-backend.in
+++ b/test/rlhc.d/case/ncall1_java.java-J-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_java.java-J-T1--goto-backend.exp b/test/rlhc.d/case/ncall1_java.java-J-T1--goto-backend.exp
index a96e9300..a96e9300 100644
--- a/test/cases/rlhc.d/case/ncall1_java.java-J-T1--goto-backend.exp
+++ b/test/rlhc.d/case/ncall1_java.java-J-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_java.java-J-T1--goto-backend.in b/test/rlhc.d/case/ncall1_java.java-J-T1--goto-backend.in
index aa7d6b25..aa7d6b25 100644
--- a/test/cases/rlhc.d/case/ncall1_java.java-J-T1--goto-backend.in
+++ b/test/rlhc.d/case/ncall1_java.java-J-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_java.java-J-T1--var-backend.exp b/test/rlhc.d/case/ncall1_java.java-J-T1--var-backend.exp
index d614e5f8..d614e5f8 100644
--- a/test/cases/rlhc.d/case/ncall1_java.java-J-T1--var-backend.exp
+++ b/test/rlhc.d/case/ncall1_java.java-J-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_java.java-J-T1--var-backend.in b/test/rlhc.d/case/ncall1_java.java-J-T1--var-backend.in
index edbfc5aa..edbfc5aa 100644
--- a/test/cases/rlhc.d/case/ncall1_java.java-J-T1--var-backend.in
+++ b/test/rlhc.d/case/ncall1_java.java-J-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_julia.jl-Y-F0--var-backend.exp b/test/rlhc.d/case/ncall1_julia.jl-Y-F0--var-backend.exp
index df0f60d3..df0f60d3 100644
--- a/test/cases/rlhc.d/case/ncall1_julia.jl-Y-F0--var-backend.exp
+++ b/test/rlhc.d/case/ncall1_julia.jl-Y-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_julia.jl-Y-F0--var-backend.in b/test/rlhc.d/case/ncall1_julia.jl-Y-F0--var-backend.in
index e0a12c38..e0a12c38 100644
--- a/test/cases/rlhc.d/case/ncall1_julia.jl-Y-F0--var-backend.in
+++ b/test/rlhc.d/case/ncall1_julia.jl-Y-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_julia.jl-Y-F1--var-backend.exp b/test/rlhc.d/case/ncall1_julia.jl-Y-F1--var-backend.exp
index d8d14121..d8d14121 100644
--- a/test/cases/rlhc.d/case/ncall1_julia.jl-Y-F1--var-backend.exp
+++ b/test/rlhc.d/case/ncall1_julia.jl-Y-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_julia.jl-Y-F1--var-backend.in b/test/rlhc.d/case/ncall1_julia.jl-Y-F1--var-backend.in
index 0d96dcce..0d96dcce 100644
--- a/test/cases/rlhc.d/case/ncall1_julia.jl-Y-F1--var-backend.in
+++ b/test/rlhc.d/case/ncall1_julia.jl-Y-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_julia.jl-Y-T0--var-backend.exp b/test/rlhc.d/case/ncall1_julia.jl-Y-T0--var-backend.exp
index 152efb69..152efb69 100644
--- a/test/cases/rlhc.d/case/ncall1_julia.jl-Y-T0--var-backend.exp
+++ b/test/rlhc.d/case/ncall1_julia.jl-Y-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_julia.jl-Y-T0--var-backend.in b/test/rlhc.d/case/ncall1_julia.jl-Y-T0--var-backend.in
index 19142fed..19142fed 100644
--- a/test/cases/rlhc.d/case/ncall1_julia.jl-Y-T0--var-backend.in
+++ b/test/rlhc.d/case/ncall1_julia.jl-Y-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_julia.jl-Y-T1--var-backend.exp b/test/rlhc.d/case/ncall1_julia.jl-Y-T1--var-backend.exp
index 9c901f88..9c901f88 100644
--- a/test/cases/rlhc.d/case/ncall1_julia.jl-Y-T1--var-backend.exp
+++ b/test/rlhc.d/case/ncall1_julia.jl-Y-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_julia.jl-Y-T1--var-backend.in b/test/rlhc.d/case/ncall1_julia.jl-Y-T1--var-backend.in
index c366a84f..c366a84f 100644
--- a/test/cases/rlhc.d/case/ncall1_julia.jl-Y-T1--var-backend.in
+++ b/test/rlhc.d/case/ncall1_julia.jl-Y-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_ocaml.ml-O-F0--var-backend.exp b/test/rlhc.d/case/ncall1_ocaml.ml-O-F0--var-backend.exp
index 98ffd869..98ffd869 100644
--- a/test/cases/rlhc.d/case/ncall1_ocaml.ml-O-F0--var-backend.exp
+++ b/test/rlhc.d/case/ncall1_ocaml.ml-O-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_ocaml.ml-O-F0--var-backend.in b/test/rlhc.d/case/ncall1_ocaml.ml-O-F0--var-backend.in
index 6920bf7d..6920bf7d 100644
--- a/test/cases/rlhc.d/case/ncall1_ocaml.ml-O-F0--var-backend.in
+++ b/test/rlhc.d/case/ncall1_ocaml.ml-O-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_ocaml.ml-O-F1--var-backend.exp b/test/rlhc.d/case/ncall1_ocaml.ml-O-F1--var-backend.exp
index f335b116..f335b116 100644
--- a/test/cases/rlhc.d/case/ncall1_ocaml.ml-O-F1--var-backend.exp
+++ b/test/rlhc.d/case/ncall1_ocaml.ml-O-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_ocaml.ml-O-F1--var-backend.in b/test/rlhc.d/case/ncall1_ocaml.ml-O-F1--var-backend.in
index f178f19e..f178f19e 100644
--- a/test/cases/rlhc.d/case/ncall1_ocaml.ml-O-F1--var-backend.in
+++ b/test/rlhc.d/case/ncall1_ocaml.ml-O-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_ocaml.ml-O-T0--var-backend.exp b/test/rlhc.d/case/ncall1_ocaml.ml-O-T0--var-backend.exp
index b5682b39..b5682b39 100644
--- a/test/cases/rlhc.d/case/ncall1_ocaml.ml-O-T0--var-backend.exp
+++ b/test/rlhc.d/case/ncall1_ocaml.ml-O-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_ocaml.ml-O-T0--var-backend.in b/test/rlhc.d/case/ncall1_ocaml.ml-O-T0--var-backend.in
index 3b1829e5..3b1829e5 100644
--- a/test/cases/rlhc.d/case/ncall1_ocaml.ml-O-T0--var-backend.in
+++ b/test/rlhc.d/case/ncall1_ocaml.ml-O-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_ocaml.ml-O-T1--var-backend.exp b/test/rlhc.d/case/ncall1_ocaml.ml-O-T1--var-backend.exp
index 222ba98c..222ba98c 100644
--- a/test/cases/rlhc.d/case/ncall1_ocaml.ml-O-T1--var-backend.exp
+++ b/test/rlhc.d/case/ncall1_ocaml.ml-O-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_ocaml.ml-O-T1--var-backend.in b/test/rlhc.d/case/ncall1_ocaml.ml-O-T1--var-backend.in
index 7be1a711..7be1a711 100644
--- a/test/cases/rlhc.d/case/ncall1_ocaml.ml-O-T1--var-backend.in
+++ b/test/rlhc.d/case/ncall1_ocaml.ml-O-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_ruby.rb-R-F0--var-backend.exp b/test/rlhc.d/case/ncall1_ruby.rb-R-F0--var-backend.exp
index 5423639b..5423639b 100644
--- a/test/cases/rlhc.d/case/ncall1_ruby.rb-R-F0--var-backend.exp
+++ b/test/rlhc.d/case/ncall1_ruby.rb-R-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_ruby.rb-R-F0--var-backend.in b/test/rlhc.d/case/ncall1_ruby.rb-R-F0--var-backend.in
index 95a9f057..95a9f057 100644
--- a/test/cases/rlhc.d/case/ncall1_ruby.rb-R-F0--var-backend.in
+++ b/test/rlhc.d/case/ncall1_ruby.rb-R-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_ruby.rb-R-F1--var-backend.exp b/test/rlhc.d/case/ncall1_ruby.rb-R-F1--var-backend.exp
index c43dd352..c43dd352 100644
--- a/test/cases/rlhc.d/case/ncall1_ruby.rb-R-F1--var-backend.exp
+++ b/test/rlhc.d/case/ncall1_ruby.rb-R-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_ruby.rb-R-F1--var-backend.in b/test/rlhc.d/case/ncall1_ruby.rb-R-F1--var-backend.in
index 5df2522a..5df2522a 100644
--- a/test/cases/rlhc.d/case/ncall1_ruby.rb-R-F1--var-backend.in
+++ b/test/rlhc.d/case/ncall1_ruby.rb-R-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_ruby.rb-R-T0--var-backend.exp b/test/rlhc.d/case/ncall1_ruby.rb-R-T0--var-backend.exp
index b2f7c465..b2f7c465 100644
--- a/test/cases/rlhc.d/case/ncall1_ruby.rb-R-T0--var-backend.exp
+++ b/test/rlhc.d/case/ncall1_ruby.rb-R-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_ruby.rb-R-T0--var-backend.in b/test/rlhc.d/case/ncall1_ruby.rb-R-T0--var-backend.in
index db3781c8..db3781c8 100644
--- a/test/cases/rlhc.d/case/ncall1_ruby.rb-R-T0--var-backend.in
+++ b/test/rlhc.d/case/ncall1_ruby.rb-R-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_ruby.rb-R-T1--var-backend.exp b/test/rlhc.d/case/ncall1_ruby.rb-R-T1--var-backend.exp
index a5199c8c..a5199c8c 100644
--- a/test/cases/rlhc.d/case/ncall1_ruby.rb-R-T1--var-backend.exp
+++ b/test/rlhc.d/case/ncall1_ruby.rb-R-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_ruby.rb-R-T1--var-backend.in b/test/rlhc.d/case/ncall1_ruby.rb-R-T1--var-backend.in
index f0486c63..f0486c63 100644
--- a/test/cases/rlhc.d/case/ncall1_ruby.rb-R-T1--var-backend.in
+++ b/test/rlhc.d/case/ncall1_ruby.rb-R-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_rust.rs-U-F0--var-backend.exp b/test/rlhc.d/case/ncall1_rust.rs-U-F0--var-backend.exp
index 2cc5cb98..2cc5cb98 100644
--- a/test/cases/rlhc.d/case/ncall1_rust.rs-U-F0--var-backend.exp
+++ b/test/rlhc.d/case/ncall1_rust.rs-U-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_rust.rs-U-F0--var-backend.in b/test/rlhc.d/case/ncall1_rust.rs-U-F0--var-backend.in
index f09a61be..f09a61be 100644
--- a/test/cases/rlhc.d/case/ncall1_rust.rs-U-F0--var-backend.in
+++ b/test/rlhc.d/case/ncall1_rust.rs-U-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_rust.rs-U-F1--var-backend.exp b/test/rlhc.d/case/ncall1_rust.rs-U-F1--var-backend.exp
index 47dd8e3e..47dd8e3e 100644
--- a/test/cases/rlhc.d/case/ncall1_rust.rs-U-F1--var-backend.exp
+++ b/test/rlhc.d/case/ncall1_rust.rs-U-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_rust.rs-U-F1--var-backend.in b/test/rlhc.d/case/ncall1_rust.rs-U-F1--var-backend.in
index 07199f8b..07199f8b 100644
--- a/test/cases/rlhc.d/case/ncall1_rust.rs-U-F1--var-backend.in
+++ b/test/rlhc.d/case/ncall1_rust.rs-U-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_rust.rs-U-T0--var-backend.exp b/test/rlhc.d/case/ncall1_rust.rs-U-T0--var-backend.exp
index fdae69e8..fdae69e8 100644
--- a/test/cases/rlhc.d/case/ncall1_rust.rs-U-T0--var-backend.exp
+++ b/test/rlhc.d/case/ncall1_rust.rs-U-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_rust.rs-U-T0--var-backend.in b/test/rlhc.d/case/ncall1_rust.rs-U-T0--var-backend.in
index bee129b1..bee129b1 100644
--- a/test/cases/rlhc.d/case/ncall1_rust.rs-U-T0--var-backend.in
+++ b/test/rlhc.d/case/ncall1_rust.rs-U-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/ncall1_rust.rs-U-T1--var-backend.exp b/test/rlhc.d/case/ncall1_rust.rs-U-T1--var-backend.exp
index ecad6f78..ecad6f78 100644
--- a/test/cases/rlhc.d/case/ncall1_rust.rs-U-T1--var-backend.exp
+++ b/test/rlhc.d/case/ncall1_rust.rs-U-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/ncall1_rust.rs-U-T1--var-backend.in b/test/rlhc.d/case/ncall1_rust.rs-U-T1--var-backend.in
index 00687c4c..00687c4c 100644
--- a/test/cases/rlhc.d/case/ncall1_rust.rs-U-T1--var-backend.in
+++ b/test/rlhc.d/case/ncall1_rust.rs-U-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/next1_c.c-C-F0--goto-backend.exp b/test/rlhc.d/case/next1_c.c-C-F0--goto-backend.exp
index ba21a32d..ba21a32d 100644
--- a/test/cases/rlhc.d/case/next1_c.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/next1_c.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_c.c-C-F0--goto-backend.in b/test/rlhc.d/case/next1_c.c-C-F0--goto-backend.in
index d97f8f03..d97f8f03 100644
--- a/test/cases/rlhc.d/case/next1_c.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/next1_c.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next1_c.c-C-F0--var-backend.exp b/test/rlhc.d/case/next1_c.c-C-F0--var-backend.exp
index 7318ac15..7318ac15 100644
--- a/test/cases/rlhc.d/case/next1_c.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/next1_c.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_c.c-C-F0--var-backend.in b/test/rlhc.d/case/next1_c.c-C-F0--var-backend.in
index ab02676a..ab02676a 100644
--- a/test/cases/rlhc.d/case/next1_c.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/next1_c.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/next1_c.c-C-F1--goto-backend.exp b/test/rlhc.d/case/next1_c.c-C-F1--goto-backend.exp
index e4904f6d..e4904f6d 100644
--- a/test/cases/rlhc.d/case/next1_c.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/next1_c.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_c.c-C-F1--goto-backend.in b/test/rlhc.d/case/next1_c.c-C-F1--goto-backend.in
index c82cea26..c82cea26 100644
--- a/test/cases/rlhc.d/case/next1_c.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/next1_c.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next1_c.c-C-F1--var-backend.exp b/test/rlhc.d/case/next1_c.c-C-F1--var-backend.exp
index b436e259..b436e259 100644
--- a/test/cases/rlhc.d/case/next1_c.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/next1_c.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_c.c-C-F1--var-backend.in b/test/rlhc.d/case/next1_c.c-C-F1--var-backend.in
index 101c3549..101c3549 100644
--- a/test/cases/rlhc.d/case/next1_c.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/next1_c.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/next1_c.c-C-G0--goto-backend.exp b/test/rlhc.d/case/next1_c.c-C-G0--goto-backend.exp
index 9c359436..9c359436 100644
--- a/test/cases/rlhc.d/case/next1_c.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/next1_c.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_c.c-C-G0--goto-backend.in b/test/rlhc.d/case/next1_c.c-C-G0--goto-backend.in
index 7fc669b0..7fc669b0 100644
--- a/test/cases/rlhc.d/case/next1_c.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/next1_c.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next1_c.c-C-G1--goto-backend.exp b/test/rlhc.d/case/next1_c.c-C-G1--goto-backend.exp
index 1541368b..1541368b 100644
--- a/test/cases/rlhc.d/case/next1_c.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/next1_c.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_c.c-C-G1--goto-backend.in b/test/rlhc.d/case/next1_c.c-C-G1--goto-backend.in
index 3776d796..3776d796 100644
--- a/test/cases/rlhc.d/case/next1_c.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/next1_c.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next1_c.c-C-G2--goto-backend.exp b/test/rlhc.d/case/next1_c.c-C-G2--goto-backend.exp
index 1f794612..1f794612 100644
--- a/test/cases/rlhc.d/case/next1_c.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/next1_c.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_c.c-C-G2--goto-backend.in b/test/rlhc.d/case/next1_c.c-C-G2--goto-backend.in
index 39ffcae2..39ffcae2 100644
--- a/test/cases/rlhc.d/case/next1_c.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/next1_c.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next1_c.c-C-T0--goto-backend.exp b/test/rlhc.d/case/next1_c.c-C-T0--goto-backend.exp
index ac18df69..ac18df69 100644
--- a/test/cases/rlhc.d/case/next1_c.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/next1_c.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_c.c-C-T0--goto-backend.in b/test/rlhc.d/case/next1_c.c-C-T0--goto-backend.in
index 1a728e2e..1a728e2e 100644
--- a/test/cases/rlhc.d/case/next1_c.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/next1_c.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next1_c.c-C-T0--var-backend.exp b/test/rlhc.d/case/next1_c.c-C-T0--var-backend.exp
index 602f0323..602f0323 100644
--- a/test/cases/rlhc.d/case/next1_c.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/next1_c.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_c.c-C-T0--var-backend.in b/test/rlhc.d/case/next1_c.c-C-T0--var-backend.in
index edc5c9a8..edc5c9a8 100644
--- a/test/cases/rlhc.d/case/next1_c.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/next1_c.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/next1_c.c-C-T1--goto-backend.exp b/test/rlhc.d/case/next1_c.c-C-T1--goto-backend.exp
index b8a01069..b8a01069 100644
--- a/test/cases/rlhc.d/case/next1_c.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/next1_c.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_c.c-C-T1--goto-backend.in b/test/rlhc.d/case/next1_c.c-C-T1--goto-backend.in
index 490611b3..490611b3 100644
--- a/test/cases/rlhc.d/case/next1_c.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/next1_c.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next1_c.c-C-T1--var-backend.exp b/test/rlhc.d/case/next1_c.c-C-T1--var-backend.exp
index bcc01cf2..bcc01cf2 100644
--- a/test/cases/rlhc.d/case/next1_c.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/next1_c.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_c.c-C-T1--var-backend.in b/test/rlhc.d/case/next1_c.c-C-T1--var-backend.in
index 9ff66eda..9ff66eda 100644
--- a/test/cases/rlhc.d/case/next1_c.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/next1_c.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/next1_crack.crk-K-F0--var-backend.exp b/test/rlhc.d/case/next1_crack.crk-K-F0--var-backend.exp
index 6299059a..6299059a 100644
--- a/test/cases/rlhc.d/case/next1_crack.crk-K-F0--var-backend.exp
+++ b/test/rlhc.d/case/next1_crack.crk-K-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_crack.crk-K-F0--var-backend.in b/test/rlhc.d/case/next1_crack.crk-K-F0--var-backend.in
index 8709939c..8709939c 100644
--- a/test/cases/rlhc.d/case/next1_crack.crk-K-F0--var-backend.in
+++ b/test/rlhc.d/case/next1_crack.crk-K-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/next1_crack.crk-K-F1--var-backend.exp b/test/rlhc.d/case/next1_crack.crk-K-F1--var-backend.exp
index 557290e1..557290e1 100644
--- a/test/cases/rlhc.d/case/next1_crack.crk-K-F1--var-backend.exp
+++ b/test/rlhc.d/case/next1_crack.crk-K-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_crack.crk-K-F1--var-backend.in b/test/rlhc.d/case/next1_crack.crk-K-F1--var-backend.in
index e9ef7ae1..e9ef7ae1 100644
--- a/test/cases/rlhc.d/case/next1_crack.crk-K-F1--var-backend.in
+++ b/test/rlhc.d/case/next1_crack.crk-K-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/next1_crack.crk-K-T0--var-backend.exp b/test/rlhc.d/case/next1_crack.crk-K-T0--var-backend.exp
index 4f0fa4c1..4f0fa4c1 100644
--- a/test/cases/rlhc.d/case/next1_crack.crk-K-T0--var-backend.exp
+++ b/test/rlhc.d/case/next1_crack.crk-K-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_crack.crk-K-T0--var-backend.in b/test/rlhc.d/case/next1_crack.crk-K-T0--var-backend.in
index 7f64f801..7f64f801 100644
--- a/test/cases/rlhc.d/case/next1_crack.crk-K-T0--var-backend.in
+++ b/test/rlhc.d/case/next1_crack.crk-K-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/next1_crack.crk-K-T1--var-backend.exp b/test/rlhc.d/case/next1_crack.crk-K-T1--var-backend.exp
index 5ddab1dc..5ddab1dc 100644
--- a/test/cases/rlhc.d/case/next1_crack.crk-K-T1--var-backend.exp
+++ b/test/rlhc.d/case/next1_crack.crk-K-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_crack.crk-K-T1--var-backend.in b/test/rlhc.d/case/next1_crack.crk-K-T1--var-backend.in
index 36b3025d..36b3025d 100644
--- a/test/cases/rlhc.d/case/next1_crack.crk-K-T1--var-backend.in
+++ b/test/rlhc.d/case/next1_crack.crk-K-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/next1_cs.cs-A-F0--goto-backend.exp b/test/rlhc.d/case/next1_cs.cs-A-F0--goto-backend.exp
index acaa8788..acaa8788 100644
--- a/test/cases/rlhc.d/case/next1_cs.cs-A-F0--goto-backend.exp
+++ b/test/rlhc.d/case/next1_cs.cs-A-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_cs.cs-A-F0--goto-backend.in b/test/rlhc.d/case/next1_cs.cs-A-F0--goto-backend.in
index 4e4567e0..4e4567e0 100644
--- a/test/cases/rlhc.d/case/next1_cs.cs-A-F0--goto-backend.in
+++ b/test/rlhc.d/case/next1_cs.cs-A-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next1_cs.cs-A-F0--var-backend.exp b/test/rlhc.d/case/next1_cs.cs-A-F0--var-backend.exp
index 74e74d78..74e74d78 100644
--- a/test/cases/rlhc.d/case/next1_cs.cs-A-F0--var-backend.exp
+++ b/test/rlhc.d/case/next1_cs.cs-A-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_cs.cs-A-F0--var-backend.in b/test/rlhc.d/case/next1_cs.cs-A-F0--var-backend.in
index 4c0366ec..4c0366ec 100644
--- a/test/cases/rlhc.d/case/next1_cs.cs-A-F0--var-backend.in
+++ b/test/rlhc.d/case/next1_cs.cs-A-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/next1_cs.cs-A-F1--goto-backend.exp b/test/rlhc.d/case/next1_cs.cs-A-F1--goto-backend.exp
index 2920bdd2..2920bdd2 100644
--- a/test/cases/rlhc.d/case/next1_cs.cs-A-F1--goto-backend.exp
+++ b/test/rlhc.d/case/next1_cs.cs-A-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_cs.cs-A-F1--goto-backend.in b/test/rlhc.d/case/next1_cs.cs-A-F1--goto-backend.in
index 9a540f71..9a540f71 100644
--- a/test/cases/rlhc.d/case/next1_cs.cs-A-F1--goto-backend.in
+++ b/test/rlhc.d/case/next1_cs.cs-A-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next1_cs.cs-A-F1--var-backend.exp b/test/rlhc.d/case/next1_cs.cs-A-F1--var-backend.exp
index 02d10329..02d10329 100644
--- a/test/cases/rlhc.d/case/next1_cs.cs-A-F1--var-backend.exp
+++ b/test/rlhc.d/case/next1_cs.cs-A-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_cs.cs-A-F1--var-backend.in b/test/rlhc.d/case/next1_cs.cs-A-F1--var-backend.in
index 3070d0a6..3070d0a6 100644
--- a/test/cases/rlhc.d/case/next1_cs.cs-A-F1--var-backend.in
+++ b/test/rlhc.d/case/next1_cs.cs-A-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/next1_cs.cs-A-G0--goto-backend.exp b/test/rlhc.d/case/next1_cs.cs-A-G0--goto-backend.exp
index 36033312..36033312 100644
--- a/test/cases/rlhc.d/case/next1_cs.cs-A-G0--goto-backend.exp
+++ b/test/rlhc.d/case/next1_cs.cs-A-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_cs.cs-A-G0--goto-backend.in b/test/rlhc.d/case/next1_cs.cs-A-G0--goto-backend.in
index 1f1a1c2f..1f1a1c2f 100644
--- a/test/cases/rlhc.d/case/next1_cs.cs-A-G0--goto-backend.in
+++ b/test/rlhc.d/case/next1_cs.cs-A-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next1_cs.cs-A-G1--goto-backend.exp b/test/rlhc.d/case/next1_cs.cs-A-G1--goto-backend.exp
index 98f51e3e..98f51e3e 100644
--- a/test/cases/rlhc.d/case/next1_cs.cs-A-G1--goto-backend.exp
+++ b/test/rlhc.d/case/next1_cs.cs-A-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_cs.cs-A-G1--goto-backend.in b/test/rlhc.d/case/next1_cs.cs-A-G1--goto-backend.in
index 9612493e..9612493e 100644
--- a/test/cases/rlhc.d/case/next1_cs.cs-A-G1--goto-backend.in
+++ b/test/rlhc.d/case/next1_cs.cs-A-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next1_cs.cs-A-T0--goto-backend.exp b/test/rlhc.d/case/next1_cs.cs-A-T0--goto-backend.exp
index 1e7e23fa..1e7e23fa 100644
--- a/test/cases/rlhc.d/case/next1_cs.cs-A-T0--goto-backend.exp
+++ b/test/rlhc.d/case/next1_cs.cs-A-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_cs.cs-A-T0--goto-backend.in b/test/rlhc.d/case/next1_cs.cs-A-T0--goto-backend.in
index 3a544a35..3a544a35 100644
--- a/test/cases/rlhc.d/case/next1_cs.cs-A-T0--goto-backend.in
+++ b/test/rlhc.d/case/next1_cs.cs-A-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next1_cs.cs-A-T0--var-backend.exp b/test/rlhc.d/case/next1_cs.cs-A-T0--var-backend.exp
index 9c551ac7..9c551ac7 100644
--- a/test/cases/rlhc.d/case/next1_cs.cs-A-T0--var-backend.exp
+++ b/test/rlhc.d/case/next1_cs.cs-A-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_cs.cs-A-T0--var-backend.in b/test/rlhc.d/case/next1_cs.cs-A-T0--var-backend.in
index 0eaad26d..0eaad26d 100644
--- a/test/cases/rlhc.d/case/next1_cs.cs-A-T0--var-backend.in
+++ b/test/rlhc.d/case/next1_cs.cs-A-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/next1_cs.cs-A-T1--goto-backend.exp b/test/rlhc.d/case/next1_cs.cs-A-T1--goto-backend.exp
index c27b8d0e..c27b8d0e 100644
--- a/test/cases/rlhc.d/case/next1_cs.cs-A-T1--goto-backend.exp
+++ b/test/rlhc.d/case/next1_cs.cs-A-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_cs.cs-A-T1--goto-backend.in b/test/rlhc.d/case/next1_cs.cs-A-T1--goto-backend.in
index af70c625..af70c625 100644
--- a/test/cases/rlhc.d/case/next1_cs.cs-A-T1--goto-backend.in
+++ b/test/rlhc.d/case/next1_cs.cs-A-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next1_cs.cs-A-T1--var-backend.exp b/test/rlhc.d/case/next1_cs.cs-A-T1--var-backend.exp
index d02ad3ef..d02ad3ef 100644
--- a/test/cases/rlhc.d/case/next1_cs.cs-A-T1--var-backend.exp
+++ b/test/rlhc.d/case/next1_cs.cs-A-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_cs.cs-A-T1--var-backend.in b/test/rlhc.d/case/next1_cs.cs-A-T1--var-backend.in
index 47672895..47672895 100644
--- a/test/cases/rlhc.d/case/next1_cs.cs-A-T1--var-backend.in
+++ b/test/rlhc.d/case/next1_cs.cs-A-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/next1_go.go-Z-F0--goto-backend.exp b/test/rlhc.d/case/next1_go.go-Z-F0--goto-backend.exp
index 680353fa..680353fa 100644
--- a/test/cases/rlhc.d/case/next1_go.go-Z-F0--goto-backend.exp
+++ b/test/rlhc.d/case/next1_go.go-Z-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_go.go-Z-F0--goto-backend.in b/test/rlhc.d/case/next1_go.go-Z-F0--goto-backend.in
index b088600d..b088600d 100644
--- a/test/cases/rlhc.d/case/next1_go.go-Z-F0--goto-backend.in
+++ b/test/rlhc.d/case/next1_go.go-Z-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next1_go.go-Z-F0--var-backend.exp b/test/rlhc.d/case/next1_go.go-Z-F0--var-backend.exp
index 5a8d280e..5a8d280e 100644
--- a/test/cases/rlhc.d/case/next1_go.go-Z-F0--var-backend.exp
+++ b/test/rlhc.d/case/next1_go.go-Z-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_go.go-Z-F0--var-backend.in b/test/rlhc.d/case/next1_go.go-Z-F0--var-backend.in
index f5679b91..f5679b91 100644
--- a/test/cases/rlhc.d/case/next1_go.go-Z-F0--var-backend.in
+++ b/test/rlhc.d/case/next1_go.go-Z-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/next1_go.go-Z-F1--goto-backend.exp b/test/rlhc.d/case/next1_go.go-Z-F1--goto-backend.exp
index 40d0ca57..40d0ca57 100644
--- a/test/cases/rlhc.d/case/next1_go.go-Z-F1--goto-backend.exp
+++ b/test/rlhc.d/case/next1_go.go-Z-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_go.go-Z-F1--goto-backend.in b/test/rlhc.d/case/next1_go.go-Z-F1--goto-backend.in
index dbf02b99..dbf02b99 100644
--- a/test/cases/rlhc.d/case/next1_go.go-Z-F1--goto-backend.in
+++ b/test/rlhc.d/case/next1_go.go-Z-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next1_go.go-Z-F1--var-backend.exp b/test/rlhc.d/case/next1_go.go-Z-F1--var-backend.exp
index a52e9715..a52e9715 100644
--- a/test/cases/rlhc.d/case/next1_go.go-Z-F1--var-backend.exp
+++ b/test/rlhc.d/case/next1_go.go-Z-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_go.go-Z-F1--var-backend.in b/test/rlhc.d/case/next1_go.go-Z-F1--var-backend.in
index 668ccc75..668ccc75 100644
--- a/test/cases/rlhc.d/case/next1_go.go-Z-F1--var-backend.in
+++ b/test/rlhc.d/case/next1_go.go-Z-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/next1_go.go-Z-G0--goto-backend.exp b/test/rlhc.d/case/next1_go.go-Z-G0--goto-backend.exp
index 0f579028..0f579028 100644
--- a/test/cases/rlhc.d/case/next1_go.go-Z-G0--goto-backend.exp
+++ b/test/rlhc.d/case/next1_go.go-Z-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_go.go-Z-G0--goto-backend.in b/test/rlhc.d/case/next1_go.go-Z-G0--goto-backend.in
index 5ffe7ce0..5ffe7ce0 100644
--- a/test/cases/rlhc.d/case/next1_go.go-Z-G0--goto-backend.in
+++ b/test/rlhc.d/case/next1_go.go-Z-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next1_go.go-Z-G1--goto-backend.exp b/test/rlhc.d/case/next1_go.go-Z-G1--goto-backend.exp
index 60a9a8f2..60a9a8f2 100644
--- a/test/cases/rlhc.d/case/next1_go.go-Z-G1--goto-backend.exp
+++ b/test/rlhc.d/case/next1_go.go-Z-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_go.go-Z-G1--goto-backend.in b/test/rlhc.d/case/next1_go.go-Z-G1--goto-backend.in
index 3d25627d..3d25627d 100644
--- a/test/cases/rlhc.d/case/next1_go.go-Z-G1--goto-backend.in
+++ b/test/rlhc.d/case/next1_go.go-Z-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next1_go.go-Z-G2--goto-backend.exp b/test/rlhc.d/case/next1_go.go-Z-G2--goto-backend.exp
index 9cfa49d1..9cfa49d1 100644
--- a/test/cases/rlhc.d/case/next1_go.go-Z-G2--goto-backend.exp
+++ b/test/rlhc.d/case/next1_go.go-Z-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_go.go-Z-G2--goto-backend.in b/test/rlhc.d/case/next1_go.go-Z-G2--goto-backend.in
index aa9ae2e6..aa9ae2e6 100644
--- a/test/cases/rlhc.d/case/next1_go.go-Z-G2--goto-backend.in
+++ b/test/rlhc.d/case/next1_go.go-Z-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next1_go.go-Z-T0--goto-backend.exp b/test/rlhc.d/case/next1_go.go-Z-T0--goto-backend.exp
index f60b9397..f60b9397 100644
--- a/test/cases/rlhc.d/case/next1_go.go-Z-T0--goto-backend.exp
+++ b/test/rlhc.d/case/next1_go.go-Z-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_go.go-Z-T0--goto-backend.in b/test/rlhc.d/case/next1_go.go-Z-T0--goto-backend.in
index 167d3440..167d3440 100644
--- a/test/cases/rlhc.d/case/next1_go.go-Z-T0--goto-backend.in
+++ b/test/rlhc.d/case/next1_go.go-Z-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next1_go.go-Z-T0--var-backend.exp b/test/rlhc.d/case/next1_go.go-Z-T0--var-backend.exp
index a2ffe55b..a2ffe55b 100644
--- a/test/cases/rlhc.d/case/next1_go.go-Z-T0--var-backend.exp
+++ b/test/rlhc.d/case/next1_go.go-Z-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_go.go-Z-T0--var-backend.in b/test/rlhc.d/case/next1_go.go-Z-T0--var-backend.in
index 7f67ce28..7f67ce28 100644
--- a/test/cases/rlhc.d/case/next1_go.go-Z-T0--var-backend.in
+++ b/test/rlhc.d/case/next1_go.go-Z-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/next1_go.go-Z-T1--goto-backend.exp b/test/rlhc.d/case/next1_go.go-Z-T1--goto-backend.exp
index ba9541b4..ba9541b4 100644
--- a/test/cases/rlhc.d/case/next1_go.go-Z-T1--goto-backend.exp
+++ b/test/rlhc.d/case/next1_go.go-Z-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_go.go-Z-T1--goto-backend.in b/test/rlhc.d/case/next1_go.go-Z-T1--goto-backend.in
index 4f134352..4f134352 100644
--- a/test/cases/rlhc.d/case/next1_go.go-Z-T1--goto-backend.in
+++ b/test/rlhc.d/case/next1_go.go-Z-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next1_go.go-Z-T1--var-backend.exp b/test/rlhc.d/case/next1_go.go-Z-T1--var-backend.exp
index 12dca7fa..12dca7fa 100644
--- a/test/cases/rlhc.d/case/next1_go.go-Z-T1--var-backend.exp
+++ b/test/rlhc.d/case/next1_go.go-Z-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_go.go-Z-T1--var-backend.in b/test/rlhc.d/case/next1_go.go-Z-T1--var-backend.in
index 316a76ec..316a76ec 100644
--- a/test/cases/rlhc.d/case/next1_go.go-Z-T1--var-backend.in
+++ b/test/rlhc.d/case/next1_go.go-Z-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/next1_java.java-J-F0--goto-backend.exp b/test/rlhc.d/case/next1_java.java-J-F0--goto-backend.exp
index 298b4e98..298b4e98 100644
--- a/test/cases/rlhc.d/case/next1_java.java-J-F0--goto-backend.exp
+++ b/test/rlhc.d/case/next1_java.java-J-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_java.java-J-F0--goto-backend.in b/test/rlhc.d/case/next1_java.java-J-F0--goto-backend.in
index 31b320b8..31b320b8 100644
--- a/test/cases/rlhc.d/case/next1_java.java-J-F0--goto-backend.in
+++ b/test/rlhc.d/case/next1_java.java-J-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next1_java.java-J-F0--var-backend.exp b/test/rlhc.d/case/next1_java.java-J-F0--var-backend.exp
index ca27b062..ca27b062 100644
--- a/test/cases/rlhc.d/case/next1_java.java-J-F0--var-backend.exp
+++ b/test/rlhc.d/case/next1_java.java-J-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_java.java-J-F0--var-backend.in b/test/rlhc.d/case/next1_java.java-J-F0--var-backend.in
index 9973179a..9973179a 100644
--- a/test/cases/rlhc.d/case/next1_java.java-J-F0--var-backend.in
+++ b/test/rlhc.d/case/next1_java.java-J-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/next1_java.java-J-F1--goto-backend.exp b/test/rlhc.d/case/next1_java.java-J-F1--goto-backend.exp
index 974c502f..974c502f 100644
--- a/test/cases/rlhc.d/case/next1_java.java-J-F1--goto-backend.exp
+++ b/test/rlhc.d/case/next1_java.java-J-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_java.java-J-F1--goto-backend.in b/test/rlhc.d/case/next1_java.java-J-F1--goto-backend.in
index cf77ed10..cf77ed10 100644
--- a/test/cases/rlhc.d/case/next1_java.java-J-F1--goto-backend.in
+++ b/test/rlhc.d/case/next1_java.java-J-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next1_java.java-J-F1--var-backend.exp b/test/rlhc.d/case/next1_java.java-J-F1--var-backend.exp
index fb31fca0..fb31fca0 100644
--- a/test/cases/rlhc.d/case/next1_java.java-J-F1--var-backend.exp
+++ b/test/rlhc.d/case/next1_java.java-J-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_java.java-J-F1--var-backend.in b/test/rlhc.d/case/next1_java.java-J-F1--var-backend.in
index 827fd713..827fd713 100644
--- a/test/cases/rlhc.d/case/next1_java.java-J-F1--var-backend.in
+++ b/test/rlhc.d/case/next1_java.java-J-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/next1_java.java-J-T0--goto-backend.exp b/test/rlhc.d/case/next1_java.java-J-T0--goto-backend.exp
index 4e368105..4e368105 100644
--- a/test/cases/rlhc.d/case/next1_java.java-J-T0--goto-backend.exp
+++ b/test/rlhc.d/case/next1_java.java-J-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_java.java-J-T0--goto-backend.in b/test/rlhc.d/case/next1_java.java-J-T0--goto-backend.in
index 3e242dcc..3e242dcc 100644
--- a/test/cases/rlhc.d/case/next1_java.java-J-T0--goto-backend.in
+++ b/test/rlhc.d/case/next1_java.java-J-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next1_java.java-J-T0--var-backend.exp b/test/rlhc.d/case/next1_java.java-J-T0--var-backend.exp
index bbe9a1ab..bbe9a1ab 100644
--- a/test/cases/rlhc.d/case/next1_java.java-J-T0--var-backend.exp
+++ b/test/rlhc.d/case/next1_java.java-J-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_java.java-J-T0--var-backend.in b/test/rlhc.d/case/next1_java.java-J-T0--var-backend.in
index e134efbe..e134efbe 100644
--- a/test/cases/rlhc.d/case/next1_java.java-J-T0--var-backend.in
+++ b/test/rlhc.d/case/next1_java.java-J-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/next1_java.java-J-T1--goto-backend.exp b/test/rlhc.d/case/next1_java.java-J-T1--goto-backend.exp
index 48b95b3f..48b95b3f 100644
--- a/test/cases/rlhc.d/case/next1_java.java-J-T1--goto-backend.exp
+++ b/test/rlhc.d/case/next1_java.java-J-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_java.java-J-T1--goto-backend.in b/test/rlhc.d/case/next1_java.java-J-T1--goto-backend.in
index c99351b4..c99351b4 100644
--- a/test/cases/rlhc.d/case/next1_java.java-J-T1--goto-backend.in
+++ b/test/rlhc.d/case/next1_java.java-J-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next1_java.java-J-T1--var-backend.exp b/test/rlhc.d/case/next1_java.java-J-T1--var-backend.exp
index 0afb4dc6..0afb4dc6 100644
--- a/test/cases/rlhc.d/case/next1_java.java-J-T1--var-backend.exp
+++ b/test/rlhc.d/case/next1_java.java-J-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_java.java-J-T1--var-backend.in b/test/rlhc.d/case/next1_java.java-J-T1--var-backend.in
index 173c1a9d..173c1a9d 100644
--- a/test/cases/rlhc.d/case/next1_java.java-J-T1--var-backend.in
+++ b/test/rlhc.d/case/next1_java.java-J-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/next1_julia.jl-Y-F0--var-backend.exp b/test/rlhc.d/case/next1_julia.jl-Y-F0--var-backend.exp
index 063f61c0..063f61c0 100644
--- a/test/cases/rlhc.d/case/next1_julia.jl-Y-F0--var-backend.exp
+++ b/test/rlhc.d/case/next1_julia.jl-Y-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_julia.jl-Y-F0--var-backend.in b/test/rlhc.d/case/next1_julia.jl-Y-F0--var-backend.in
index 43d3089a..43d3089a 100644
--- a/test/cases/rlhc.d/case/next1_julia.jl-Y-F0--var-backend.in
+++ b/test/rlhc.d/case/next1_julia.jl-Y-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/next1_julia.jl-Y-F1--var-backend.exp b/test/rlhc.d/case/next1_julia.jl-Y-F1--var-backend.exp
index 5aa725ad..5aa725ad 100644
--- a/test/cases/rlhc.d/case/next1_julia.jl-Y-F1--var-backend.exp
+++ b/test/rlhc.d/case/next1_julia.jl-Y-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_julia.jl-Y-F1--var-backend.in b/test/rlhc.d/case/next1_julia.jl-Y-F1--var-backend.in
index 1c44782b..1c44782b 100644
--- a/test/cases/rlhc.d/case/next1_julia.jl-Y-F1--var-backend.in
+++ b/test/rlhc.d/case/next1_julia.jl-Y-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/next1_julia.jl-Y-T0--var-backend.exp b/test/rlhc.d/case/next1_julia.jl-Y-T0--var-backend.exp
index 5136fb66..5136fb66 100644
--- a/test/cases/rlhc.d/case/next1_julia.jl-Y-T0--var-backend.exp
+++ b/test/rlhc.d/case/next1_julia.jl-Y-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_julia.jl-Y-T0--var-backend.in b/test/rlhc.d/case/next1_julia.jl-Y-T0--var-backend.in
index 6ee26b9f..6ee26b9f 100644
--- a/test/cases/rlhc.d/case/next1_julia.jl-Y-T0--var-backend.in
+++ b/test/rlhc.d/case/next1_julia.jl-Y-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/next1_julia.jl-Y-T1--var-backend.exp b/test/rlhc.d/case/next1_julia.jl-Y-T1--var-backend.exp
index cdbda8eb..cdbda8eb 100644
--- a/test/cases/rlhc.d/case/next1_julia.jl-Y-T1--var-backend.exp
+++ b/test/rlhc.d/case/next1_julia.jl-Y-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_julia.jl-Y-T1--var-backend.in b/test/rlhc.d/case/next1_julia.jl-Y-T1--var-backend.in
index 19f82ba5..19f82ba5 100644
--- a/test/cases/rlhc.d/case/next1_julia.jl-Y-T1--var-backend.in
+++ b/test/rlhc.d/case/next1_julia.jl-Y-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/next1_ocaml.ml-O-F0--var-backend.exp b/test/rlhc.d/case/next1_ocaml.ml-O-F0--var-backend.exp
index 317d4cc6..317d4cc6 100644
--- a/test/cases/rlhc.d/case/next1_ocaml.ml-O-F0--var-backend.exp
+++ b/test/rlhc.d/case/next1_ocaml.ml-O-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_ocaml.ml-O-F0--var-backend.in b/test/rlhc.d/case/next1_ocaml.ml-O-F0--var-backend.in
index ecd20958..ecd20958 100644
--- a/test/cases/rlhc.d/case/next1_ocaml.ml-O-F0--var-backend.in
+++ b/test/rlhc.d/case/next1_ocaml.ml-O-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/next1_ocaml.ml-O-F1--var-backend.exp b/test/rlhc.d/case/next1_ocaml.ml-O-F1--var-backend.exp
index e8c76ab8..e8c76ab8 100644
--- a/test/cases/rlhc.d/case/next1_ocaml.ml-O-F1--var-backend.exp
+++ b/test/rlhc.d/case/next1_ocaml.ml-O-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_ocaml.ml-O-F1--var-backend.in b/test/rlhc.d/case/next1_ocaml.ml-O-F1--var-backend.in
index 2f708e9a..2f708e9a 100644
--- a/test/cases/rlhc.d/case/next1_ocaml.ml-O-F1--var-backend.in
+++ b/test/rlhc.d/case/next1_ocaml.ml-O-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/next1_ocaml.ml-O-T0--var-backend.exp b/test/rlhc.d/case/next1_ocaml.ml-O-T0--var-backend.exp
index b741d408..b741d408 100644
--- a/test/cases/rlhc.d/case/next1_ocaml.ml-O-T0--var-backend.exp
+++ b/test/rlhc.d/case/next1_ocaml.ml-O-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_ocaml.ml-O-T0--var-backend.in b/test/rlhc.d/case/next1_ocaml.ml-O-T0--var-backend.in
index 3e9e456a..3e9e456a 100644
--- a/test/cases/rlhc.d/case/next1_ocaml.ml-O-T0--var-backend.in
+++ b/test/rlhc.d/case/next1_ocaml.ml-O-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/next1_ocaml.ml-O-T1--var-backend.exp b/test/rlhc.d/case/next1_ocaml.ml-O-T1--var-backend.exp
index bda0c2c7..bda0c2c7 100644
--- a/test/cases/rlhc.d/case/next1_ocaml.ml-O-T1--var-backend.exp
+++ b/test/rlhc.d/case/next1_ocaml.ml-O-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_ocaml.ml-O-T1--var-backend.in b/test/rlhc.d/case/next1_ocaml.ml-O-T1--var-backend.in
index 5fa9baed..5fa9baed 100644
--- a/test/cases/rlhc.d/case/next1_ocaml.ml-O-T1--var-backend.in
+++ b/test/rlhc.d/case/next1_ocaml.ml-O-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/next1_ruby.rb-R-F0--var-backend.exp b/test/rlhc.d/case/next1_ruby.rb-R-F0--var-backend.exp
index 1eaa0a67..1eaa0a67 100644
--- a/test/cases/rlhc.d/case/next1_ruby.rb-R-F0--var-backend.exp
+++ b/test/rlhc.d/case/next1_ruby.rb-R-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_ruby.rb-R-F0--var-backend.in b/test/rlhc.d/case/next1_ruby.rb-R-F0--var-backend.in
index a4f8d298..a4f8d298 100644
--- a/test/cases/rlhc.d/case/next1_ruby.rb-R-F0--var-backend.in
+++ b/test/rlhc.d/case/next1_ruby.rb-R-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/next1_ruby.rb-R-F1--var-backend.exp b/test/rlhc.d/case/next1_ruby.rb-R-F1--var-backend.exp
index 5f783c76..5f783c76 100644
--- a/test/cases/rlhc.d/case/next1_ruby.rb-R-F1--var-backend.exp
+++ b/test/rlhc.d/case/next1_ruby.rb-R-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_ruby.rb-R-F1--var-backend.in b/test/rlhc.d/case/next1_ruby.rb-R-F1--var-backend.in
index 41d4f432..41d4f432 100644
--- a/test/cases/rlhc.d/case/next1_ruby.rb-R-F1--var-backend.in
+++ b/test/rlhc.d/case/next1_ruby.rb-R-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/next1_ruby.rb-R-T0--var-backend.exp b/test/rlhc.d/case/next1_ruby.rb-R-T0--var-backend.exp
index af379a74..af379a74 100644
--- a/test/cases/rlhc.d/case/next1_ruby.rb-R-T0--var-backend.exp
+++ b/test/rlhc.d/case/next1_ruby.rb-R-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_ruby.rb-R-T0--var-backend.in b/test/rlhc.d/case/next1_ruby.rb-R-T0--var-backend.in
index a968018c..a968018c 100644
--- a/test/cases/rlhc.d/case/next1_ruby.rb-R-T0--var-backend.in
+++ b/test/rlhc.d/case/next1_ruby.rb-R-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/next1_ruby.rb-R-T1--var-backend.exp b/test/rlhc.d/case/next1_ruby.rb-R-T1--var-backend.exp
index 5d1877a1..5d1877a1 100644
--- a/test/cases/rlhc.d/case/next1_ruby.rb-R-T1--var-backend.exp
+++ b/test/rlhc.d/case/next1_ruby.rb-R-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_ruby.rb-R-T1--var-backend.in b/test/rlhc.d/case/next1_ruby.rb-R-T1--var-backend.in
index bd192a34..bd192a34 100644
--- a/test/cases/rlhc.d/case/next1_ruby.rb-R-T1--var-backend.in
+++ b/test/rlhc.d/case/next1_ruby.rb-R-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/next1_rust.rs-U-F0--var-backend.exp b/test/rlhc.d/case/next1_rust.rs-U-F0--var-backend.exp
index 1e60ed74..1e60ed74 100644
--- a/test/cases/rlhc.d/case/next1_rust.rs-U-F0--var-backend.exp
+++ b/test/rlhc.d/case/next1_rust.rs-U-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_rust.rs-U-F0--var-backend.in b/test/rlhc.d/case/next1_rust.rs-U-F0--var-backend.in
index a7043304..a7043304 100644
--- a/test/cases/rlhc.d/case/next1_rust.rs-U-F0--var-backend.in
+++ b/test/rlhc.d/case/next1_rust.rs-U-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/next1_rust.rs-U-F1--var-backend.exp b/test/rlhc.d/case/next1_rust.rs-U-F1--var-backend.exp
index 31f0e6e3..31f0e6e3 100644
--- a/test/cases/rlhc.d/case/next1_rust.rs-U-F1--var-backend.exp
+++ b/test/rlhc.d/case/next1_rust.rs-U-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_rust.rs-U-F1--var-backend.in b/test/rlhc.d/case/next1_rust.rs-U-F1--var-backend.in
index 1ac8ad84..1ac8ad84 100644
--- a/test/cases/rlhc.d/case/next1_rust.rs-U-F1--var-backend.in
+++ b/test/rlhc.d/case/next1_rust.rs-U-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/next1_rust.rs-U-T0--var-backend.exp b/test/rlhc.d/case/next1_rust.rs-U-T0--var-backend.exp
index af7001d2..af7001d2 100644
--- a/test/cases/rlhc.d/case/next1_rust.rs-U-T0--var-backend.exp
+++ b/test/rlhc.d/case/next1_rust.rs-U-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_rust.rs-U-T0--var-backend.in b/test/rlhc.d/case/next1_rust.rs-U-T0--var-backend.in
index 00c208d1..00c208d1 100644
--- a/test/cases/rlhc.d/case/next1_rust.rs-U-T0--var-backend.in
+++ b/test/rlhc.d/case/next1_rust.rs-U-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/next1_rust.rs-U-T1--var-backend.exp b/test/rlhc.d/case/next1_rust.rs-U-T1--var-backend.exp
index 5d428e24..5d428e24 100644
--- a/test/cases/rlhc.d/case/next1_rust.rs-U-T1--var-backend.exp
+++ b/test/rlhc.d/case/next1_rust.rs-U-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next1_rust.rs-U-T1--var-backend.in b/test/rlhc.d/case/next1_rust.rs-U-T1--var-backend.in
index 9dc8659b..9dc8659b 100644
--- a/test/cases/rlhc.d/case/next1_rust.rs-U-T1--var-backend.in
+++ b/test/rlhc.d/case/next1_rust.rs-U-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/next2_c.c-C-F0--goto-backend.exp b/test/rlhc.d/case/next2_c.c-C-F0--goto-backend.exp
index e15763c7..e15763c7 100644
--- a/test/cases/rlhc.d/case/next2_c.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/next2_c.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_c.c-C-F0--goto-backend.in b/test/rlhc.d/case/next2_c.c-C-F0--goto-backend.in
index 02b95b2d..02b95b2d 100644
--- a/test/cases/rlhc.d/case/next2_c.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/next2_c.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next2_c.c-C-F0--var-backend.exp b/test/rlhc.d/case/next2_c.c-C-F0--var-backend.exp
index ad65c624..ad65c624 100644
--- a/test/cases/rlhc.d/case/next2_c.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/next2_c.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_c.c-C-F0--var-backend.in b/test/rlhc.d/case/next2_c.c-C-F0--var-backend.in
index ec4fcbbb..ec4fcbbb 100644
--- a/test/cases/rlhc.d/case/next2_c.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/next2_c.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/next2_c.c-C-F1--goto-backend.exp b/test/rlhc.d/case/next2_c.c-C-F1--goto-backend.exp
index 87d0291d..87d0291d 100644
--- a/test/cases/rlhc.d/case/next2_c.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/next2_c.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_c.c-C-F1--goto-backend.in b/test/rlhc.d/case/next2_c.c-C-F1--goto-backend.in
index 6423e59e..6423e59e 100644
--- a/test/cases/rlhc.d/case/next2_c.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/next2_c.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next2_c.c-C-F1--var-backend.exp b/test/rlhc.d/case/next2_c.c-C-F1--var-backend.exp
index 3dee3ab6..3dee3ab6 100644
--- a/test/cases/rlhc.d/case/next2_c.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/next2_c.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_c.c-C-F1--var-backend.in b/test/rlhc.d/case/next2_c.c-C-F1--var-backend.in
index b4b7c92e..b4b7c92e 100644
--- a/test/cases/rlhc.d/case/next2_c.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/next2_c.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/next2_c.c-C-G0--goto-backend.exp b/test/rlhc.d/case/next2_c.c-C-G0--goto-backend.exp
index 9ed38ad9..9ed38ad9 100644
--- a/test/cases/rlhc.d/case/next2_c.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/next2_c.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_c.c-C-G0--goto-backend.in b/test/rlhc.d/case/next2_c.c-C-G0--goto-backend.in
index d0531d30..d0531d30 100644
--- a/test/cases/rlhc.d/case/next2_c.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/next2_c.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next2_c.c-C-G1--goto-backend.exp b/test/rlhc.d/case/next2_c.c-C-G1--goto-backend.exp
index d8845583..d8845583 100644
--- a/test/cases/rlhc.d/case/next2_c.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/next2_c.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_c.c-C-G1--goto-backend.in b/test/rlhc.d/case/next2_c.c-C-G1--goto-backend.in
index af78d49c..af78d49c 100644
--- a/test/cases/rlhc.d/case/next2_c.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/next2_c.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next2_c.c-C-G2--goto-backend.exp b/test/rlhc.d/case/next2_c.c-C-G2--goto-backend.exp
index 14c703f2..14c703f2 100644
--- a/test/cases/rlhc.d/case/next2_c.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/next2_c.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_c.c-C-G2--goto-backend.in b/test/rlhc.d/case/next2_c.c-C-G2--goto-backend.in
index 1f268ec6..1f268ec6 100644
--- a/test/cases/rlhc.d/case/next2_c.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/next2_c.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next2_c.c-C-T0--goto-backend.exp b/test/rlhc.d/case/next2_c.c-C-T0--goto-backend.exp
index 76d1bcf1..76d1bcf1 100644
--- a/test/cases/rlhc.d/case/next2_c.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/next2_c.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_c.c-C-T0--goto-backend.in b/test/rlhc.d/case/next2_c.c-C-T0--goto-backend.in
index e1092546..e1092546 100644
--- a/test/cases/rlhc.d/case/next2_c.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/next2_c.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next2_c.c-C-T0--var-backend.exp b/test/rlhc.d/case/next2_c.c-C-T0--var-backend.exp
index de840f77..de840f77 100644
--- a/test/cases/rlhc.d/case/next2_c.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/next2_c.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_c.c-C-T0--var-backend.in b/test/rlhc.d/case/next2_c.c-C-T0--var-backend.in
index 4e67077b..4e67077b 100644
--- a/test/cases/rlhc.d/case/next2_c.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/next2_c.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/next2_c.c-C-T1--goto-backend.exp b/test/rlhc.d/case/next2_c.c-C-T1--goto-backend.exp
index e209bc0d..e209bc0d 100644
--- a/test/cases/rlhc.d/case/next2_c.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/next2_c.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_c.c-C-T1--goto-backend.in b/test/rlhc.d/case/next2_c.c-C-T1--goto-backend.in
index 1c966746..1c966746 100644
--- a/test/cases/rlhc.d/case/next2_c.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/next2_c.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next2_c.c-C-T1--var-backend.exp b/test/rlhc.d/case/next2_c.c-C-T1--var-backend.exp
index ea8e48e5..ea8e48e5 100644
--- a/test/cases/rlhc.d/case/next2_c.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/next2_c.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_c.c-C-T1--var-backend.in b/test/rlhc.d/case/next2_c.c-C-T1--var-backend.in
index ad23c2f6..ad23c2f6 100644
--- a/test/cases/rlhc.d/case/next2_c.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/next2_c.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/next2_crack.crk-K-F0--var-backend.exp b/test/rlhc.d/case/next2_crack.crk-K-F0--var-backend.exp
index 365bc227..365bc227 100644
--- a/test/cases/rlhc.d/case/next2_crack.crk-K-F0--var-backend.exp
+++ b/test/rlhc.d/case/next2_crack.crk-K-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_crack.crk-K-F0--var-backend.in b/test/rlhc.d/case/next2_crack.crk-K-F0--var-backend.in
index 75460862..75460862 100644
--- a/test/cases/rlhc.d/case/next2_crack.crk-K-F0--var-backend.in
+++ b/test/rlhc.d/case/next2_crack.crk-K-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/next2_crack.crk-K-F1--var-backend.exp b/test/rlhc.d/case/next2_crack.crk-K-F1--var-backend.exp
index 7e1b6b99..7e1b6b99 100644
--- a/test/cases/rlhc.d/case/next2_crack.crk-K-F1--var-backend.exp
+++ b/test/rlhc.d/case/next2_crack.crk-K-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_crack.crk-K-F1--var-backend.in b/test/rlhc.d/case/next2_crack.crk-K-F1--var-backend.in
index 8317ed71..8317ed71 100644
--- a/test/cases/rlhc.d/case/next2_crack.crk-K-F1--var-backend.in
+++ b/test/rlhc.d/case/next2_crack.crk-K-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/next2_crack.crk-K-T0--var-backend.exp b/test/rlhc.d/case/next2_crack.crk-K-T0--var-backend.exp
index cfb4f324..cfb4f324 100644
--- a/test/cases/rlhc.d/case/next2_crack.crk-K-T0--var-backend.exp
+++ b/test/rlhc.d/case/next2_crack.crk-K-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_crack.crk-K-T0--var-backend.in b/test/rlhc.d/case/next2_crack.crk-K-T0--var-backend.in
index 24f4658e..24f4658e 100644
--- a/test/cases/rlhc.d/case/next2_crack.crk-K-T0--var-backend.in
+++ b/test/rlhc.d/case/next2_crack.crk-K-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/next2_crack.crk-K-T1--var-backend.exp b/test/rlhc.d/case/next2_crack.crk-K-T1--var-backend.exp
index 70742510..70742510 100644
--- a/test/cases/rlhc.d/case/next2_crack.crk-K-T1--var-backend.exp
+++ b/test/rlhc.d/case/next2_crack.crk-K-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_crack.crk-K-T1--var-backend.in b/test/rlhc.d/case/next2_crack.crk-K-T1--var-backend.in
index e3bfcd92..e3bfcd92 100644
--- a/test/cases/rlhc.d/case/next2_crack.crk-K-T1--var-backend.in
+++ b/test/rlhc.d/case/next2_crack.crk-K-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/next2_cs.cs-A-F0--goto-backend.exp b/test/rlhc.d/case/next2_cs.cs-A-F0--goto-backend.exp
index 4a849b1c..4a849b1c 100644
--- a/test/cases/rlhc.d/case/next2_cs.cs-A-F0--goto-backend.exp
+++ b/test/rlhc.d/case/next2_cs.cs-A-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_cs.cs-A-F0--goto-backend.in b/test/rlhc.d/case/next2_cs.cs-A-F0--goto-backend.in
index 0a7315c6..0a7315c6 100644
--- a/test/cases/rlhc.d/case/next2_cs.cs-A-F0--goto-backend.in
+++ b/test/rlhc.d/case/next2_cs.cs-A-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next2_cs.cs-A-F0--var-backend.exp b/test/rlhc.d/case/next2_cs.cs-A-F0--var-backend.exp
index ed4a1138..ed4a1138 100644
--- a/test/cases/rlhc.d/case/next2_cs.cs-A-F0--var-backend.exp
+++ b/test/rlhc.d/case/next2_cs.cs-A-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_cs.cs-A-F0--var-backend.in b/test/rlhc.d/case/next2_cs.cs-A-F0--var-backend.in
index fe7d0e9b..fe7d0e9b 100644
--- a/test/cases/rlhc.d/case/next2_cs.cs-A-F0--var-backend.in
+++ b/test/rlhc.d/case/next2_cs.cs-A-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/next2_cs.cs-A-F1--goto-backend.exp b/test/rlhc.d/case/next2_cs.cs-A-F1--goto-backend.exp
index 809bef4c..809bef4c 100644
--- a/test/cases/rlhc.d/case/next2_cs.cs-A-F1--goto-backend.exp
+++ b/test/rlhc.d/case/next2_cs.cs-A-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_cs.cs-A-F1--goto-backend.in b/test/rlhc.d/case/next2_cs.cs-A-F1--goto-backend.in
index c6e393aa..c6e393aa 100644
--- a/test/cases/rlhc.d/case/next2_cs.cs-A-F1--goto-backend.in
+++ b/test/rlhc.d/case/next2_cs.cs-A-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next2_cs.cs-A-F1--var-backend.exp b/test/rlhc.d/case/next2_cs.cs-A-F1--var-backend.exp
index 70359cde..70359cde 100644
--- a/test/cases/rlhc.d/case/next2_cs.cs-A-F1--var-backend.exp
+++ b/test/rlhc.d/case/next2_cs.cs-A-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_cs.cs-A-F1--var-backend.in b/test/rlhc.d/case/next2_cs.cs-A-F1--var-backend.in
index e04c5222..e04c5222 100644
--- a/test/cases/rlhc.d/case/next2_cs.cs-A-F1--var-backend.in
+++ b/test/rlhc.d/case/next2_cs.cs-A-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/next2_cs.cs-A-G0--goto-backend.exp b/test/rlhc.d/case/next2_cs.cs-A-G0--goto-backend.exp
index 778265ea..778265ea 100644
--- a/test/cases/rlhc.d/case/next2_cs.cs-A-G0--goto-backend.exp
+++ b/test/rlhc.d/case/next2_cs.cs-A-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_cs.cs-A-G0--goto-backend.in b/test/rlhc.d/case/next2_cs.cs-A-G0--goto-backend.in
index aacd3489..aacd3489 100644
--- a/test/cases/rlhc.d/case/next2_cs.cs-A-G0--goto-backend.in
+++ b/test/rlhc.d/case/next2_cs.cs-A-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next2_cs.cs-A-G1--goto-backend.exp b/test/rlhc.d/case/next2_cs.cs-A-G1--goto-backend.exp
index cf81e86c..cf81e86c 100644
--- a/test/cases/rlhc.d/case/next2_cs.cs-A-G1--goto-backend.exp
+++ b/test/rlhc.d/case/next2_cs.cs-A-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_cs.cs-A-G1--goto-backend.in b/test/rlhc.d/case/next2_cs.cs-A-G1--goto-backend.in
index 7e52172c..7e52172c 100644
--- a/test/cases/rlhc.d/case/next2_cs.cs-A-G1--goto-backend.in
+++ b/test/rlhc.d/case/next2_cs.cs-A-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next2_cs.cs-A-T0--goto-backend.exp b/test/rlhc.d/case/next2_cs.cs-A-T0--goto-backend.exp
index 60fda65e..60fda65e 100644
--- a/test/cases/rlhc.d/case/next2_cs.cs-A-T0--goto-backend.exp
+++ b/test/rlhc.d/case/next2_cs.cs-A-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_cs.cs-A-T0--goto-backend.in b/test/rlhc.d/case/next2_cs.cs-A-T0--goto-backend.in
index a4f4143c..a4f4143c 100644
--- a/test/cases/rlhc.d/case/next2_cs.cs-A-T0--goto-backend.in
+++ b/test/rlhc.d/case/next2_cs.cs-A-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next2_cs.cs-A-T0--var-backend.exp b/test/rlhc.d/case/next2_cs.cs-A-T0--var-backend.exp
index 4610585c..4610585c 100644
--- a/test/cases/rlhc.d/case/next2_cs.cs-A-T0--var-backend.exp
+++ b/test/rlhc.d/case/next2_cs.cs-A-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_cs.cs-A-T0--var-backend.in b/test/rlhc.d/case/next2_cs.cs-A-T0--var-backend.in
index 6e3a7319..6e3a7319 100644
--- a/test/cases/rlhc.d/case/next2_cs.cs-A-T0--var-backend.in
+++ b/test/rlhc.d/case/next2_cs.cs-A-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/next2_cs.cs-A-T1--goto-backend.exp b/test/rlhc.d/case/next2_cs.cs-A-T1--goto-backend.exp
index 4c34d81e..4c34d81e 100644
--- a/test/cases/rlhc.d/case/next2_cs.cs-A-T1--goto-backend.exp
+++ b/test/rlhc.d/case/next2_cs.cs-A-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_cs.cs-A-T1--goto-backend.in b/test/rlhc.d/case/next2_cs.cs-A-T1--goto-backend.in
index f3fd726c..f3fd726c 100644
--- a/test/cases/rlhc.d/case/next2_cs.cs-A-T1--goto-backend.in
+++ b/test/rlhc.d/case/next2_cs.cs-A-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next2_cs.cs-A-T1--var-backend.exp b/test/rlhc.d/case/next2_cs.cs-A-T1--var-backend.exp
index 0d10419d..0d10419d 100644
--- a/test/cases/rlhc.d/case/next2_cs.cs-A-T1--var-backend.exp
+++ b/test/rlhc.d/case/next2_cs.cs-A-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_cs.cs-A-T1--var-backend.in b/test/rlhc.d/case/next2_cs.cs-A-T1--var-backend.in
index 901610f8..901610f8 100644
--- a/test/cases/rlhc.d/case/next2_cs.cs-A-T1--var-backend.in
+++ b/test/rlhc.d/case/next2_cs.cs-A-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/next2_go.go-Z-F0--goto-backend.exp b/test/rlhc.d/case/next2_go.go-Z-F0--goto-backend.exp
index 30027822..30027822 100644
--- a/test/cases/rlhc.d/case/next2_go.go-Z-F0--goto-backend.exp
+++ b/test/rlhc.d/case/next2_go.go-Z-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_go.go-Z-F0--goto-backend.in b/test/rlhc.d/case/next2_go.go-Z-F0--goto-backend.in
index 890f8c9b..890f8c9b 100644
--- a/test/cases/rlhc.d/case/next2_go.go-Z-F0--goto-backend.in
+++ b/test/rlhc.d/case/next2_go.go-Z-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next2_go.go-Z-F0--var-backend.exp b/test/rlhc.d/case/next2_go.go-Z-F0--var-backend.exp
index c9e08eb0..c9e08eb0 100644
--- a/test/cases/rlhc.d/case/next2_go.go-Z-F0--var-backend.exp
+++ b/test/rlhc.d/case/next2_go.go-Z-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_go.go-Z-F0--var-backend.in b/test/rlhc.d/case/next2_go.go-Z-F0--var-backend.in
index cccbc6af..cccbc6af 100644
--- a/test/cases/rlhc.d/case/next2_go.go-Z-F0--var-backend.in
+++ b/test/rlhc.d/case/next2_go.go-Z-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/next2_go.go-Z-F1--goto-backend.exp b/test/rlhc.d/case/next2_go.go-Z-F1--goto-backend.exp
index 4f0f9945..4f0f9945 100644
--- a/test/cases/rlhc.d/case/next2_go.go-Z-F1--goto-backend.exp
+++ b/test/rlhc.d/case/next2_go.go-Z-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_go.go-Z-F1--goto-backend.in b/test/rlhc.d/case/next2_go.go-Z-F1--goto-backend.in
index fd620132..fd620132 100644
--- a/test/cases/rlhc.d/case/next2_go.go-Z-F1--goto-backend.in
+++ b/test/rlhc.d/case/next2_go.go-Z-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next2_go.go-Z-F1--var-backend.exp b/test/rlhc.d/case/next2_go.go-Z-F1--var-backend.exp
index 097bd330..097bd330 100644
--- a/test/cases/rlhc.d/case/next2_go.go-Z-F1--var-backend.exp
+++ b/test/rlhc.d/case/next2_go.go-Z-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_go.go-Z-F1--var-backend.in b/test/rlhc.d/case/next2_go.go-Z-F1--var-backend.in
index 7f4b1b2e..7f4b1b2e 100644
--- a/test/cases/rlhc.d/case/next2_go.go-Z-F1--var-backend.in
+++ b/test/rlhc.d/case/next2_go.go-Z-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/next2_go.go-Z-G0--goto-backend.exp b/test/rlhc.d/case/next2_go.go-Z-G0--goto-backend.exp
index 4c9f5ef1..4c9f5ef1 100644
--- a/test/cases/rlhc.d/case/next2_go.go-Z-G0--goto-backend.exp
+++ b/test/rlhc.d/case/next2_go.go-Z-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_go.go-Z-G0--goto-backend.in b/test/rlhc.d/case/next2_go.go-Z-G0--goto-backend.in
index 6db7366b..6db7366b 100644
--- a/test/cases/rlhc.d/case/next2_go.go-Z-G0--goto-backend.in
+++ b/test/rlhc.d/case/next2_go.go-Z-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next2_go.go-Z-G1--goto-backend.exp b/test/rlhc.d/case/next2_go.go-Z-G1--goto-backend.exp
index e5c2bac5..e5c2bac5 100644
--- a/test/cases/rlhc.d/case/next2_go.go-Z-G1--goto-backend.exp
+++ b/test/rlhc.d/case/next2_go.go-Z-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_go.go-Z-G1--goto-backend.in b/test/rlhc.d/case/next2_go.go-Z-G1--goto-backend.in
index da643de1..da643de1 100644
--- a/test/cases/rlhc.d/case/next2_go.go-Z-G1--goto-backend.in
+++ b/test/rlhc.d/case/next2_go.go-Z-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next2_go.go-Z-G2--goto-backend.exp b/test/rlhc.d/case/next2_go.go-Z-G2--goto-backend.exp
index 55f167a1..55f167a1 100644
--- a/test/cases/rlhc.d/case/next2_go.go-Z-G2--goto-backend.exp
+++ b/test/rlhc.d/case/next2_go.go-Z-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_go.go-Z-G2--goto-backend.in b/test/rlhc.d/case/next2_go.go-Z-G2--goto-backend.in
index 773a40c0..773a40c0 100644
--- a/test/cases/rlhc.d/case/next2_go.go-Z-G2--goto-backend.in
+++ b/test/rlhc.d/case/next2_go.go-Z-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next2_go.go-Z-T0--goto-backend.exp b/test/rlhc.d/case/next2_go.go-Z-T0--goto-backend.exp
index 8585aec5..8585aec5 100644
--- a/test/cases/rlhc.d/case/next2_go.go-Z-T0--goto-backend.exp
+++ b/test/rlhc.d/case/next2_go.go-Z-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_go.go-Z-T0--goto-backend.in b/test/rlhc.d/case/next2_go.go-Z-T0--goto-backend.in
index b60a6368..b60a6368 100644
--- a/test/cases/rlhc.d/case/next2_go.go-Z-T0--goto-backend.in
+++ b/test/rlhc.d/case/next2_go.go-Z-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next2_go.go-Z-T0--var-backend.exp b/test/rlhc.d/case/next2_go.go-Z-T0--var-backend.exp
index ed442486..ed442486 100644
--- a/test/cases/rlhc.d/case/next2_go.go-Z-T0--var-backend.exp
+++ b/test/rlhc.d/case/next2_go.go-Z-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_go.go-Z-T0--var-backend.in b/test/rlhc.d/case/next2_go.go-Z-T0--var-backend.in
index 9c3ebe5e..9c3ebe5e 100644
--- a/test/cases/rlhc.d/case/next2_go.go-Z-T0--var-backend.in
+++ b/test/rlhc.d/case/next2_go.go-Z-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/next2_go.go-Z-T1--goto-backend.exp b/test/rlhc.d/case/next2_go.go-Z-T1--goto-backend.exp
index 99b41cd3..99b41cd3 100644
--- a/test/cases/rlhc.d/case/next2_go.go-Z-T1--goto-backend.exp
+++ b/test/rlhc.d/case/next2_go.go-Z-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_go.go-Z-T1--goto-backend.in b/test/rlhc.d/case/next2_go.go-Z-T1--goto-backend.in
index b609eaaf..b609eaaf 100644
--- a/test/cases/rlhc.d/case/next2_go.go-Z-T1--goto-backend.in
+++ b/test/rlhc.d/case/next2_go.go-Z-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next2_go.go-Z-T1--var-backend.exp b/test/rlhc.d/case/next2_go.go-Z-T1--var-backend.exp
index d4db1b59..d4db1b59 100644
--- a/test/cases/rlhc.d/case/next2_go.go-Z-T1--var-backend.exp
+++ b/test/rlhc.d/case/next2_go.go-Z-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_go.go-Z-T1--var-backend.in b/test/rlhc.d/case/next2_go.go-Z-T1--var-backend.in
index b2493e42..b2493e42 100644
--- a/test/cases/rlhc.d/case/next2_go.go-Z-T1--var-backend.in
+++ b/test/rlhc.d/case/next2_go.go-Z-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/next2_java.java-J-F0--goto-backend.exp b/test/rlhc.d/case/next2_java.java-J-F0--goto-backend.exp
index 22a0b515..22a0b515 100644
--- a/test/cases/rlhc.d/case/next2_java.java-J-F0--goto-backend.exp
+++ b/test/rlhc.d/case/next2_java.java-J-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_java.java-J-F0--goto-backend.in b/test/rlhc.d/case/next2_java.java-J-F0--goto-backend.in
index 4775fb85..4775fb85 100644
--- a/test/cases/rlhc.d/case/next2_java.java-J-F0--goto-backend.in
+++ b/test/rlhc.d/case/next2_java.java-J-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next2_java.java-J-F0--var-backend.exp b/test/rlhc.d/case/next2_java.java-J-F0--var-backend.exp
index 1ba1046c..1ba1046c 100644
--- a/test/cases/rlhc.d/case/next2_java.java-J-F0--var-backend.exp
+++ b/test/rlhc.d/case/next2_java.java-J-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_java.java-J-F0--var-backend.in b/test/rlhc.d/case/next2_java.java-J-F0--var-backend.in
index a49cf484..a49cf484 100644
--- a/test/cases/rlhc.d/case/next2_java.java-J-F0--var-backend.in
+++ b/test/rlhc.d/case/next2_java.java-J-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/next2_java.java-J-F1--goto-backend.exp b/test/rlhc.d/case/next2_java.java-J-F1--goto-backend.exp
index f81f082e..f81f082e 100644
--- a/test/cases/rlhc.d/case/next2_java.java-J-F1--goto-backend.exp
+++ b/test/rlhc.d/case/next2_java.java-J-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_java.java-J-F1--goto-backend.in b/test/rlhc.d/case/next2_java.java-J-F1--goto-backend.in
index 0a38b267..0a38b267 100644
--- a/test/cases/rlhc.d/case/next2_java.java-J-F1--goto-backend.in
+++ b/test/rlhc.d/case/next2_java.java-J-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next2_java.java-J-F1--var-backend.exp b/test/rlhc.d/case/next2_java.java-J-F1--var-backend.exp
index 1becc54d..1becc54d 100644
--- a/test/cases/rlhc.d/case/next2_java.java-J-F1--var-backend.exp
+++ b/test/rlhc.d/case/next2_java.java-J-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_java.java-J-F1--var-backend.in b/test/rlhc.d/case/next2_java.java-J-F1--var-backend.in
index 8cee14d7..8cee14d7 100644
--- a/test/cases/rlhc.d/case/next2_java.java-J-F1--var-backend.in
+++ b/test/rlhc.d/case/next2_java.java-J-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/next2_java.java-J-T0--goto-backend.exp b/test/rlhc.d/case/next2_java.java-J-T0--goto-backend.exp
index 511476be..511476be 100644
--- a/test/cases/rlhc.d/case/next2_java.java-J-T0--goto-backend.exp
+++ b/test/rlhc.d/case/next2_java.java-J-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_java.java-J-T0--goto-backend.in b/test/rlhc.d/case/next2_java.java-J-T0--goto-backend.in
index f6a6106c..f6a6106c 100644
--- a/test/cases/rlhc.d/case/next2_java.java-J-T0--goto-backend.in
+++ b/test/rlhc.d/case/next2_java.java-J-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next2_java.java-J-T0--var-backend.exp b/test/rlhc.d/case/next2_java.java-J-T0--var-backend.exp
index e97544fb..e97544fb 100644
--- a/test/cases/rlhc.d/case/next2_java.java-J-T0--var-backend.exp
+++ b/test/rlhc.d/case/next2_java.java-J-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_java.java-J-T0--var-backend.in b/test/rlhc.d/case/next2_java.java-J-T0--var-backend.in
index 2df2e341..2df2e341 100644
--- a/test/cases/rlhc.d/case/next2_java.java-J-T0--var-backend.in
+++ b/test/rlhc.d/case/next2_java.java-J-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/next2_java.java-J-T1--goto-backend.exp b/test/rlhc.d/case/next2_java.java-J-T1--goto-backend.exp
index 5526f434..5526f434 100644
--- a/test/cases/rlhc.d/case/next2_java.java-J-T1--goto-backend.exp
+++ b/test/rlhc.d/case/next2_java.java-J-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_java.java-J-T1--goto-backend.in b/test/rlhc.d/case/next2_java.java-J-T1--goto-backend.in
index 3f5422e7..3f5422e7 100644
--- a/test/cases/rlhc.d/case/next2_java.java-J-T1--goto-backend.in
+++ b/test/rlhc.d/case/next2_java.java-J-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/next2_java.java-J-T1--var-backend.exp b/test/rlhc.d/case/next2_java.java-J-T1--var-backend.exp
index 18bd1a00..18bd1a00 100644
--- a/test/cases/rlhc.d/case/next2_java.java-J-T1--var-backend.exp
+++ b/test/rlhc.d/case/next2_java.java-J-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_java.java-J-T1--var-backend.in b/test/rlhc.d/case/next2_java.java-J-T1--var-backend.in
index 213dfd00..213dfd00 100644
--- a/test/cases/rlhc.d/case/next2_java.java-J-T1--var-backend.in
+++ b/test/rlhc.d/case/next2_java.java-J-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/next2_julia.jl-Y-F0--var-backend.exp b/test/rlhc.d/case/next2_julia.jl-Y-F0--var-backend.exp
index 9e3ca5a4..9e3ca5a4 100644
--- a/test/cases/rlhc.d/case/next2_julia.jl-Y-F0--var-backend.exp
+++ b/test/rlhc.d/case/next2_julia.jl-Y-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_julia.jl-Y-F0--var-backend.in b/test/rlhc.d/case/next2_julia.jl-Y-F0--var-backend.in
index d08abd31..d08abd31 100644
--- a/test/cases/rlhc.d/case/next2_julia.jl-Y-F0--var-backend.in
+++ b/test/rlhc.d/case/next2_julia.jl-Y-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/next2_julia.jl-Y-F1--var-backend.exp b/test/rlhc.d/case/next2_julia.jl-Y-F1--var-backend.exp
index e9c2c41b..e9c2c41b 100644
--- a/test/cases/rlhc.d/case/next2_julia.jl-Y-F1--var-backend.exp
+++ b/test/rlhc.d/case/next2_julia.jl-Y-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_julia.jl-Y-F1--var-backend.in b/test/rlhc.d/case/next2_julia.jl-Y-F1--var-backend.in
index 1f52c9ac..1f52c9ac 100644
--- a/test/cases/rlhc.d/case/next2_julia.jl-Y-F1--var-backend.in
+++ b/test/rlhc.d/case/next2_julia.jl-Y-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/next2_julia.jl-Y-T0--var-backend.exp b/test/rlhc.d/case/next2_julia.jl-Y-T0--var-backend.exp
index 6a1e8dff..6a1e8dff 100644
--- a/test/cases/rlhc.d/case/next2_julia.jl-Y-T0--var-backend.exp
+++ b/test/rlhc.d/case/next2_julia.jl-Y-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_julia.jl-Y-T0--var-backend.in b/test/rlhc.d/case/next2_julia.jl-Y-T0--var-backend.in
index e224e7f1..e224e7f1 100644
--- a/test/cases/rlhc.d/case/next2_julia.jl-Y-T0--var-backend.in
+++ b/test/rlhc.d/case/next2_julia.jl-Y-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/next2_julia.jl-Y-T1--var-backend.exp b/test/rlhc.d/case/next2_julia.jl-Y-T1--var-backend.exp
index 10d8ef83..10d8ef83 100644
--- a/test/cases/rlhc.d/case/next2_julia.jl-Y-T1--var-backend.exp
+++ b/test/rlhc.d/case/next2_julia.jl-Y-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_julia.jl-Y-T1--var-backend.in b/test/rlhc.d/case/next2_julia.jl-Y-T1--var-backend.in
index dfa39083..dfa39083 100644
--- a/test/cases/rlhc.d/case/next2_julia.jl-Y-T1--var-backend.in
+++ b/test/rlhc.d/case/next2_julia.jl-Y-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/next2_ocaml.ml-O-F0--var-backend.exp b/test/rlhc.d/case/next2_ocaml.ml-O-F0--var-backend.exp
index 7c861773..7c861773 100644
--- a/test/cases/rlhc.d/case/next2_ocaml.ml-O-F0--var-backend.exp
+++ b/test/rlhc.d/case/next2_ocaml.ml-O-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_ocaml.ml-O-F0--var-backend.in b/test/rlhc.d/case/next2_ocaml.ml-O-F0--var-backend.in
index cc182476..cc182476 100644
--- a/test/cases/rlhc.d/case/next2_ocaml.ml-O-F0--var-backend.in
+++ b/test/rlhc.d/case/next2_ocaml.ml-O-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/next2_ocaml.ml-O-F1--var-backend.exp b/test/rlhc.d/case/next2_ocaml.ml-O-F1--var-backend.exp
index 6bf89b02..6bf89b02 100644
--- a/test/cases/rlhc.d/case/next2_ocaml.ml-O-F1--var-backend.exp
+++ b/test/rlhc.d/case/next2_ocaml.ml-O-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_ocaml.ml-O-F1--var-backend.in b/test/rlhc.d/case/next2_ocaml.ml-O-F1--var-backend.in
index b81f2730..b81f2730 100644
--- a/test/cases/rlhc.d/case/next2_ocaml.ml-O-F1--var-backend.in
+++ b/test/rlhc.d/case/next2_ocaml.ml-O-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/next2_ocaml.ml-O-T0--var-backend.exp b/test/rlhc.d/case/next2_ocaml.ml-O-T0--var-backend.exp
index dd2a4ec7..dd2a4ec7 100644
--- a/test/cases/rlhc.d/case/next2_ocaml.ml-O-T0--var-backend.exp
+++ b/test/rlhc.d/case/next2_ocaml.ml-O-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_ocaml.ml-O-T0--var-backend.in b/test/rlhc.d/case/next2_ocaml.ml-O-T0--var-backend.in
index 034e3e6d..034e3e6d 100644
--- a/test/cases/rlhc.d/case/next2_ocaml.ml-O-T0--var-backend.in
+++ b/test/rlhc.d/case/next2_ocaml.ml-O-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/next2_ocaml.ml-O-T1--var-backend.exp b/test/rlhc.d/case/next2_ocaml.ml-O-T1--var-backend.exp
index d0bf19b9..d0bf19b9 100644
--- a/test/cases/rlhc.d/case/next2_ocaml.ml-O-T1--var-backend.exp
+++ b/test/rlhc.d/case/next2_ocaml.ml-O-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_ocaml.ml-O-T1--var-backend.in b/test/rlhc.d/case/next2_ocaml.ml-O-T1--var-backend.in
index 99250b78..99250b78 100644
--- a/test/cases/rlhc.d/case/next2_ocaml.ml-O-T1--var-backend.in
+++ b/test/rlhc.d/case/next2_ocaml.ml-O-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/next2_ruby.rb-R-F0--var-backend.exp b/test/rlhc.d/case/next2_ruby.rb-R-F0--var-backend.exp
index 564131b0..564131b0 100644
--- a/test/cases/rlhc.d/case/next2_ruby.rb-R-F0--var-backend.exp
+++ b/test/rlhc.d/case/next2_ruby.rb-R-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_ruby.rb-R-F0--var-backend.in b/test/rlhc.d/case/next2_ruby.rb-R-F0--var-backend.in
index 5aca7dbc..5aca7dbc 100644
--- a/test/cases/rlhc.d/case/next2_ruby.rb-R-F0--var-backend.in
+++ b/test/rlhc.d/case/next2_ruby.rb-R-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/next2_ruby.rb-R-F1--var-backend.exp b/test/rlhc.d/case/next2_ruby.rb-R-F1--var-backend.exp
index 00b47be9..00b47be9 100644
--- a/test/cases/rlhc.d/case/next2_ruby.rb-R-F1--var-backend.exp
+++ b/test/rlhc.d/case/next2_ruby.rb-R-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_ruby.rb-R-F1--var-backend.in b/test/rlhc.d/case/next2_ruby.rb-R-F1--var-backend.in
index 07d1fe2a..07d1fe2a 100644
--- a/test/cases/rlhc.d/case/next2_ruby.rb-R-F1--var-backend.in
+++ b/test/rlhc.d/case/next2_ruby.rb-R-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/next2_ruby.rb-R-T0--var-backend.exp b/test/rlhc.d/case/next2_ruby.rb-R-T0--var-backend.exp
index 3d5eda66..3d5eda66 100644
--- a/test/cases/rlhc.d/case/next2_ruby.rb-R-T0--var-backend.exp
+++ b/test/rlhc.d/case/next2_ruby.rb-R-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_ruby.rb-R-T0--var-backend.in b/test/rlhc.d/case/next2_ruby.rb-R-T0--var-backend.in
index cea0fa94..cea0fa94 100644
--- a/test/cases/rlhc.d/case/next2_ruby.rb-R-T0--var-backend.in
+++ b/test/rlhc.d/case/next2_ruby.rb-R-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/next2_ruby.rb-R-T1--var-backend.exp b/test/rlhc.d/case/next2_ruby.rb-R-T1--var-backend.exp
index 30a30f31..30a30f31 100644
--- a/test/cases/rlhc.d/case/next2_ruby.rb-R-T1--var-backend.exp
+++ b/test/rlhc.d/case/next2_ruby.rb-R-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_ruby.rb-R-T1--var-backend.in b/test/rlhc.d/case/next2_ruby.rb-R-T1--var-backend.in
index f3c74f85..f3c74f85 100644
--- a/test/cases/rlhc.d/case/next2_ruby.rb-R-T1--var-backend.in
+++ b/test/rlhc.d/case/next2_ruby.rb-R-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/next2_rust.rs-U-F0--var-backend.exp b/test/rlhc.d/case/next2_rust.rs-U-F0--var-backend.exp
index e177d89d..e177d89d 100644
--- a/test/cases/rlhc.d/case/next2_rust.rs-U-F0--var-backend.exp
+++ b/test/rlhc.d/case/next2_rust.rs-U-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_rust.rs-U-F0--var-backend.in b/test/rlhc.d/case/next2_rust.rs-U-F0--var-backend.in
index 6bdd311a..6bdd311a 100644
--- a/test/cases/rlhc.d/case/next2_rust.rs-U-F0--var-backend.in
+++ b/test/rlhc.d/case/next2_rust.rs-U-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/next2_rust.rs-U-F1--var-backend.exp b/test/rlhc.d/case/next2_rust.rs-U-F1--var-backend.exp
index 66e7d374..66e7d374 100644
--- a/test/cases/rlhc.d/case/next2_rust.rs-U-F1--var-backend.exp
+++ b/test/rlhc.d/case/next2_rust.rs-U-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_rust.rs-U-F1--var-backend.in b/test/rlhc.d/case/next2_rust.rs-U-F1--var-backend.in
index 704ab575..704ab575 100644
--- a/test/cases/rlhc.d/case/next2_rust.rs-U-F1--var-backend.in
+++ b/test/rlhc.d/case/next2_rust.rs-U-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/next2_rust.rs-U-T0--var-backend.exp b/test/rlhc.d/case/next2_rust.rs-U-T0--var-backend.exp
index 2dea76b0..2dea76b0 100644
--- a/test/cases/rlhc.d/case/next2_rust.rs-U-T0--var-backend.exp
+++ b/test/rlhc.d/case/next2_rust.rs-U-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_rust.rs-U-T0--var-backend.in b/test/rlhc.d/case/next2_rust.rs-U-T0--var-backend.in
index 27c4d913..27c4d913 100644
--- a/test/cases/rlhc.d/case/next2_rust.rs-U-T0--var-backend.in
+++ b/test/rlhc.d/case/next2_rust.rs-U-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/next2_rust.rs-U-T1--var-backend.exp b/test/rlhc.d/case/next2_rust.rs-U-T1--var-backend.exp
index 5deffbb9..5deffbb9 100644
--- a/test/cases/rlhc.d/case/next2_rust.rs-U-T1--var-backend.exp
+++ b/test/rlhc.d/case/next2_rust.rs-U-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/next2_rust.rs-U-T1--var-backend.in b/test/rlhc.d/case/next2_rust.rs-U-T1--var-backend.in
index f691cfa6..f691cfa6 100644
--- a/test/cases/rlhc.d/case/next2_rust.rs-U-T1--var-backend.in
+++ b/test/rlhc.d/case/next2_rust.rs-U-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/nfa1.c-C-F0--goto-backend.exp b/test/rlhc.d/case/nfa1.c-C-F0--goto-backend.exp
index 6eabcf17..6eabcf17 100644
--- a/test/cases/rlhc.d/case/nfa1.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/nfa1.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/nfa1.c-C-F0--goto-backend.in b/test/rlhc.d/case/nfa1.c-C-F0--goto-backend.in
index de1594ea..de1594ea 100644
--- a/test/cases/rlhc.d/case/nfa1.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/nfa1.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/nfa1.c-C-F0--var-backend.exp b/test/rlhc.d/case/nfa1.c-C-F0--var-backend.exp
index 0020a64c..0020a64c 100644
--- a/test/cases/rlhc.d/case/nfa1.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/nfa1.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/nfa1.c-C-F0--var-backend.in b/test/rlhc.d/case/nfa1.c-C-F0--var-backend.in
index 1c351f80..1c351f80 100644
--- a/test/cases/rlhc.d/case/nfa1.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/nfa1.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/nfa1.c-C-F1--goto-backend.exp b/test/rlhc.d/case/nfa1.c-C-F1--goto-backend.exp
index 6d45537b..6d45537b 100644
--- a/test/cases/rlhc.d/case/nfa1.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/nfa1.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/nfa1.c-C-F1--goto-backend.in b/test/rlhc.d/case/nfa1.c-C-F1--goto-backend.in
index 68ae4ed5..68ae4ed5 100644
--- a/test/cases/rlhc.d/case/nfa1.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/nfa1.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/nfa1.c-C-F1--var-backend.exp b/test/rlhc.d/case/nfa1.c-C-F1--var-backend.exp
index e75cb7df..e75cb7df 100644
--- a/test/cases/rlhc.d/case/nfa1.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/nfa1.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/nfa1.c-C-F1--var-backend.in b/test/rlhc.d/case/nfa1.c-C-F1--var-backend.in
index 05f4fb55..05f4fb55 100644
--- a/test/cases/rlhc.d/case/nfa1.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/nfa1.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/nfa1.c-C-G0--goto-backend.exp b/test/rlhc.d/case/nfa1.c-C-G0--goto-backend.exp
index 4b1f2950..4b1f2950 100644
--- a/test/cases/rlhc.d/case/nfa1.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/nfa1.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/nfa1.c-C-G0--goto-backend.in b/test/rlhc.d/case/nfa1.c-C-G0--goto-backend.in
index 5bc2462d..5bc2462d 100644
--- a/test/cases/rlhc.d/case/nfa1.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/nfa1.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/nfa1.c-C-G1--goto-backend.exp b/test/rlhc.d/case/nfa1.c-C-G1--goto-backend.exp
index 7a1c1356..7a1c1356 100644
--- a/test/cases/rlhc.d/case/nfa1.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/nfa1.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/nfa1.c-C-G1--goto-backend.in b/test/rlhc.d/case/nfa1.c-C-G1--goto-backend.in
index 8f017b9a..8f017b9a 100644
--- a/test/cases/rlhc.d/case/nfa1.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/nfa1.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/nfa1.c-C-G2--goto-backend.exp b/test/rlhc.d/case/nfa1.c-C-G2--goto-backend.exp
index 8036ddd9..8036ddd9 100644
--- a/test/cases/rlhc.d/case/nfa1.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/nfa1.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/nfa1.c-C-G2--goto-backend.in b/test/rlhc.d/case/nfa1.c-C-G2--goto-backend.in
index 24389211..24389211 100644
--- a/test/cases/rlhc.d/case/nfa1.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/nfa1.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/nfa1.c-C-T0--goto-backend.exp b/test/rlhc.d/case/nfa1.c-C-T0--goto-backend.exp
index fd298bd1..fd298bd1 100644
--- a/test/cases/rlhc.d/case/nfa1.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/nfa1.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/nfa1.c-C-T0--goto-backend.in b/test/rlhc.d/case/nfa1.c-C-T0--goto-backend.in
index d20fa52e..d20fa52e 100644
--- a/test/cases/rlhc.d/case/nfa1.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/nfa1.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/nfa1.c-C-T0--var-backend.exp b/test/rlhc.d/case/nfa1.c-C-T0--var-backend.exp
index ef80e62f..ef80e62f 100644
--- a/test/cases/rlhc.d/case/nfa1.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/nfa1.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/nfa1.c-C-T0--var-backend.in b/test/rlhc.d/case/nfa1.c-C-T0--var-backend.in
index a1edc2de..a1edc2de 100644
--- a/test/cases/rlhc.d/case/nfa1.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/nfa1.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/nfa1.c-C-T1--goto-backend.exp b/test/rlhc.d/case/nfa1.c-C-T1--goto-backend.exp
index ba364e9e..ba364e9e 100644
--- a/test/cases/rlhc.d/case/nfa1.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/nfa1.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/nfa1.c-C-T1--goto-backend.in b/test/rlhc.d/case/nfa1.c-C-T1--goto-backend.in
index ec9cdc7f..ec9cdc7f 100644
--- a/test/cases/rlhc.d/case/nfa1.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/nfa1.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/nfa1.c-C-T1--var-backend.exp b/test/rlhc.d/case/nfa1.c-C-T1--var-backend.exp
index 8c20a450..8c20a450 100644
--- a/test/cases/rlhc.d/case/nfa1.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/nfa1.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/nfa1.c-C-T1--var-backend.in b/test/rlhc.d/case/nfa1.c-C-T1--var-backend.in
index 59466fd7..59466fd7 100644
--- a/test/cases/rlhc.d/case/nfa1.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/nfa1.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/nfa3.c-C-F0--goto-backend.exp b/test/rlhc.d/case/nfa3.c-C-F0--goto-backend.exp
index 956053f4..956053f4 100644
--- a/test/cases/rlhc.d/case/nfa3.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/nfa3.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/nfa3.c-C-F0--goto-backend.in b/test/rlhc.d/case/nfa3.c-C-F0--goto-backend.in
index 42a49a4d..42a49a4d 100644
--- a/test/cases/rlhc.d/case/nfa3.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/nfa3.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/nfa3.c-C-F0--var-backend.exp b/test/rlhc.d/case/nfa3.c-C-F0--var-backend.exp
index 082d7f05..082d7f05 100644
--- a/test/cases/rlhc.d/case/nfa3.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/nfa3.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/nfa3.c-C-F0--var-backend.in b/test/rlhc.d/case/nfa3.c-C-F0--var-backend.in
index ef274027..ef274027 100644
--- a/test/cases/rlhc.d/case/nfa3.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/nfa3.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/nfa3.c-C-F1--goto-backend.exp b/test/rlhc.d/case/nfa3.c-C-F1--goto-backend.exp
index bd6dd764..bd6dd764 100644
--- a/test/cases/rlhc.d/case/nfa3.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/nfa3.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/nfa3.c-C-F1--goto-backend.in b/test/rlhc.d/case/nfa3.c-C-F1--goto-backend.in
index 5874b6fb..5874b6fb 100644
--- a/test/cases/rlhc.d/case/nfa3.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/nfa3.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/nfa3.c-C-F1--var-backend.exp b/test/rlhc.d/case/nfa3.c-C-F1--var-backend.exp
index 58fa64e3..58fa64e3 100644
--- a/test/cases/rlhc.d/case/nfa3.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/nfa3.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/nfa3.c-C-F1--var-backend.in b/test/rlhc.d/case/nfa3.c-C-F1--var-backend.in
index 403a0711..403a0711 100644
--- a/test/cases/rlhc.d/case/nfa3.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/nfa3.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/nfa3.c-C-G0--goto-backend.exp b/test/rlhc.d/case/nfa3.c-C-G0--goto-backend.exp
index 4812933e..4812933e 100644
--- a/test/cases/rlhc.d/case/nfa3.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/nfa3.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/nfa3.c-C-G0--goto-backend.in b/test/rlhc.d/case/nfa3.c-C-G0--goto-backend.in
index 805aa07b..805aa07b 100644
--- a/test/cases/rlhc.d/case/nfa3.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/nfa3.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/nfa3.c-C-G1--goto-backend.exp b/test/rlhc.d/case/nfa3.c-C-G1--goto-backend.exp
index 055ad25a..055ad25a 100644
--- a/test/cases/rlhc.d/case/nfa3.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/nfa3.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/nfa3.c-C-G1--goto-backend.in b/test/rlhc.d/case/nfa3.c-C-G1--goto-backend.in
index 3b51f06a..3b51f06a 100644
--- a/test/cases/rlhc.d/case/nfa3.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/nfa3.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/nfa3.c-C-G2--goto-backend.exp b/test/rlhc.d/case/nfa3.c-C-G2--goto-backend.exp
index c7ba478e..c7ba478e 100644
--- a/test/cases/rlhc.d/case/nfa3.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/nfa3.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/nfa3.c-C-G2--goto-backend.in b/test/rlhc.d/case/nfa3.c-C-G2--goto-backend.in
index 25a6d687..25a6d687 100644
--- a/test/cases/rlhc.d/case/nfa3.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/nfa3.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/nfa3.c-C-T0--goto-backend.exp b/test/rlhc.d/case/nfa3.c-C-T0--goto-backend.exp
index 9e59bc78..9e59bc78 100644
--- a/test/cases/rlhc.d/case/nfa3.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/nfa3.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/nfa3.c-C-T0--goto-backend.in b/test/rlhc.d/case/nfa3.c-C-T0--goto-backend.in
index b065a5a8..b065a5a8 100644
--- a/test/cases/rlhc.d/case/nfa3.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/nfa3.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/nfa3.c-C-T0--var-backend.exp b/test/rlhc.d/case/nfa3.c-C-T0--var-backend.exp
index 69b23508..69b23508 100644
--- a/test/cases/rlhc.d/case/nfa3.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/nfa3.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/nfa3.c-C-T0--var-backend.in b/test/rlhc.d/case/nfa3.c-C-T0--var-backend.in
index 1b1f2fd6..1b1f2fd6 100644
--- a/test/cases/rlhc.d/case/nfa3.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/nfa3.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/nfa3.c-C-T1--goto-backend.exp b/test/rlhc.d/case/nfa3.c-C-T1--goto-backend.exp
index 2892d8e5..2892d8e5 100644
--- a/test/cases/rlhc.d/case/nfa3.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/nfa3.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/nfa3.c-C-T1--goto-backend.in b/test/rlhc.d/case/nfa3.c-C-T1--goto-backend.in
index f6cdb6e1..f6cdb6e1 100644
--- a/test/cases/rlhc.d/case/nfa3.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/nfa3.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/nfa3.c-C-T1--var-backend.exp b/test/rlhc.d/case/nfa3.c-C-T1--var-backend.exp
index adf3bdf4..adf3bdf4 100644
--- a/test/cases/rlhc.d/case/nfa3.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/nfa3.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/nfa3.c-C-T1--var-backend.in b/test/rlhc.d/case/nfa3.c-C-T1--var-backend.in
index 0f5ac13e..0f5ac13e 100644
--- a/test/cases/rlhc.d/case/nfa3.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/nfa3.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/noignore.c-C-F0--goto-backend.exp b/test/rlhc.d/case/noignore.c-C-F0--goto-backend.exp
index 5993f261..5993f261 100644
--- a/test/cases/rlhc.d/case/noignore.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/noignore.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/noignore.c-C-F0--goto-backend.in b/test/rlhc.d/case/noignore.c-C-F0--goto-backend.in
index d701e7e8..d701e7e8 100644
--- a/test/cases/rlhc.d/case/noignore.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/noignore.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/noignore.c-C-F0--var-backend.exp b/test/rlhc.d/case/noignore.c-C-F0--var-backend.exp
index e8904df1..e8904df1 100644
--- a/test/cases/rlhc.d/case/noignore.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/noignore.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/noignore.c-C-F0--var-backend.in b/test/rlhc.d/case/noignore.c-C-F0--var-backend.in
index aa4a8034..aa4a8034 100644
--- a/test/cases/rlhc.d/case/noignore.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/noignore.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/noignore.c-C-F1--goto-backend.exp b/test/rlhc.d/case/noignore.c-C-F1--goto-backend.exp
index 9dc41b04..9dc41b04 100644
--- a/test/cases/rlhc.d/case/noignore.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/noignore.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/noignore.c-C-F1--goto-backend.in b/test/rlhc.d/case/noignore.c-C-F1--goto-backend.in
index 99b82366..99b82366 100644
--- a/test/cases/rlhc.d/case/noignore.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/noignore.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/noignore.c-C-F1--var-backend.exp b/test/rlhc.d/case/noignore.c-C-F1--var-backend.exp
index 1f49967b..1f49967b 100644
--- a/test/cases/rlhc.d/case/noignore.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/noignore.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/noignore.c-C-F1--var-backend.in b/test/rlhc.d/case/noignore.c-C-F1--var-backend.in
index 6bbbbfa2..6bbbbfa2 100644
--- a/test/cases/rlhc.d/case/noignore.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/noignore.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/noignore.c-C-G0--goto-backend.exp b/test/rlhc.d/case/noignore.c-C-G0--goto-backend.exp
index 497c630e..497c630e 100644
--- a/test/cases/rlhc.d/case/noignore.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/noignore.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/noignore.c-C-G0--goto-backend.in b/test/rlhc.d/case/noignore.c-C-G0--goto-backend.in
index c5fd6ebd..c5fd6ebd 100644
--- a/test/cases/rlhc.d/case/noignore.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/noignore.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/noignore.c-C-G1--goto-backend.exp b/test/rlhc.d/case/noignore.c-C-G1--goto-backend.exp
index 548c9450..548c9450 100644
--- a/test/cases/rlhc.d/case/noignore.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/noignore.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/noignore.c-C-G1--goto-backend.in b/test/rlhc.d/case/noignore.c-C-G1--goto-backend.in
index 82dc2261..82dc2261 100644
--- a/test/cases/rlhc.d/case/noignore.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/noignore.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/noignore.c-C-G2--goto-backend.exp b/test/rlhc.d/case/noignore.c-C-G2--goto-backend.exp
index af7b1768..af7b1768 100644
--- a/test/cases/rlhc.d/case/noignore.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/noignore.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/noignore.c-C-G2--goto-backend.in b/test/rlhc.d/case/noignore.c-C-G2--goto-backend.in
index 48bb196d..48bb196d 100644
--- a/test/cases/rlhc.d/case/noignore.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/noignore.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/noignore.c-C-T0--goto-backend.exp b/test/rlhc.d/case/noignore.c-C-T0--goto-backend.exp
index d36bba8b..d36bba8b 100644
--- a/test/cases/rlhc.d/case/noignore.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/noignore.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/noignore.c-C-T0--goto-backend.in b/test/rlhc.d/case/noignore.c-C-T0--goto-backend.in
index 7a53f669..7a53f669 100644
--- a/test/cases/rlhc.d/case/noignore.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/noignore.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/noignore.c-C-T0--var-backend.exp b/test/rlhc.d/case/noignore.c-C-T0--var-backend.exp
index 034caed8..034caed8 100644
--- a/test/cases/rlhc.d/case/noignore.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/noignore.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/noignore.c-C-T0--var-backend.in b/test/rlhc.d/case/noignore.c-C-T0--var-backend.in
index e3c88e9c..e3c88e9c 100644
--- a/test/cases/rlhc.d/case/noignore.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/noignore.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/noignore.c-C-T1--goto-backend.exp b/test/rlhc.d/case/noignore.c-C-T1--goto-backend.exp
index 31c0567b..31c0567b 100644
--- a/test/cases/rlhc.d/case/noignore.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/noignore.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/noignore.c-C-T1--goto-backend.in b/test/rlhc.d/case/noignore.c-C-T1--goto-backend.in
index 9893aae1..9893aae1 100644
--- a/test/cases/rlhc.d/case/noignore.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/noignore.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/noignore.c-C-T1--var-backend.exp b/test/rlhc.d/case/noignore.c-C-T1--var-backend.exp
index 705b8c9b..705b8c9b 100644
--- a/test/cases/rlhc.d/case/noignore.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/noignore.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/noignore.c-C-T1--var-backend.in b/test/rlhc.d/case/noignore.c-C-T1--var-backend.in
index 12a3f8b2..12a3f8b2 100644
--- a/test/cases/rlhc.d/case/noignore.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/noignore.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/patact_c.c-C-F0--goto-backend.exp b/test/rlhc.d/case/patact_c.c-C-F0--goto-backend.exp
index 5e290a98..5e290a98 100644
--- a/test/cases/rlhc.d/case/patact_c.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/patact_c.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_c.c-C-F0--goto-backend.in b/test/rlhc.d/case/patact_c.c-C-F0--goto-backend.in
index 3e4c4622..3e4c4622 100644
--- a/test/cases/rlhc.d/case/patact_c.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/patact_c.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/patact_c.c-C-F0--var-backend.exp b/test/rlhc.d/case/patact_c.c-C-F0--var-backend.exp
index 4f4fcb34..4f4fcb34 100644
--- a/test/cases/rlhc.d/case/patact_c.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/patact_c.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_c.c-C-F0--var-backend.in b/test/rlhc.d/case/patact_c.c-C-F0--var-backend.in
index 304e9485..304e9485 100644
--- a/test/cases/rlhc.d/case/patact_c.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/patact_c.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/patact_c.c-C-F1--goto-backend.exp b/test/rlhc.d/case/patact_c.c-C-F1--goto-backend.exp
index a46ba40e..a46ba40e 100644
--- a/test/cases/rlhc.d/case/patact_c.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/patact_c.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_c.c-C-F1--goto-backend.in b/test/rlhc.d/case/patact_c.c-C-F1--goto-backend.in
index 3bd4791d..3bd4791d 100644
--- a/test/cases/rlhc.d/case/patact_c.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/patact_c.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/patact_c.c-C-F1--var-backend.exp b/test/rlhc.d/case/patact_c.c-C-F1--var-backend.exp
index f3a0a574..f3a0a574 100644
--- a/test/cases/rlhc.d/case/patact_c.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/patact_c.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_c.c-C-F1--var-backend.in b/test/rlhc.d/case/patact_c.c-C-F1--var-backend.in
index 8d62c8d9..8d62c8d9 100644
--- a/test/cases/rlhc.d/case/patact_c.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/patact_c.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/patact_c.c-C-G0--goto-backend.exp b/test/rlhc.d/case/patact_c.c-C-G0--goto-backend.exp
index 42fbae64..42fbae64 100644
--- a/test/cases/rlhc.d/case/patact_c.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/patact_c.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_c.c-C-G0--goto-backend.in b/test/rlhc.d/case/patact_c.c-C-G0--goto-backend.in
index 81ab00de..81ab00de 100644
--- a/test/cases/rlhc.d/case/patact_c.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/patact_c.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/patact_c.c-C-G1--goto-backend.exp b/test/rlhc.d/case/patact_c.c-C-G1--goto-backend.exp
index 520b1d0a..520b1d0a 100644
--- a/test/cases/rlhc.d/case/patact_c.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/patact_c.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_c.c-C-G1--goto-backend.in b/test/rlhc.d/case/patact_c.c-C-G1--goto-backend.in
index d295c6b2..d295c6b2 100644
--- a/test/cases/rlhc.d/case/patact_c.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/patact_c.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/patact_c.c-C-G2--goto-backend.exp b/test/rlhc.d/case/patact_c.c-C-G2--goto-backend.exp
index 8fc93d9a..8fc93d9a 100644
--- a/test/cases/rlhc.d/case/patact_c.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/patact_c.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_c.c-C-G2--goto-backend.in b/test/rlhc.d/case/patact_c.c-C-G2--goto-backend.in
index a34b1a73..a34b1a73 100644
--- a/test/cases/rlhc.d/case/patact_c.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/patact_c.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/patact_c.c-C-T0--goto-backend.exp b/test/rlhc.d/case/patact_c.c-C-T0--goto-backend.exp
index a8fb1297..a8fb1297 100644
--- a/test/cases/rlhc.d/case/patact_c.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/patact_c.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_c.c-C-T0--goto-backend.in b/test/rlhc.d/case/patact_c.c-C-T0--goto-backend.in
index 603b8e81..603b8e81 100644
--- a/test/cases/rlhc.d/case/patact_c.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/patact_c.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/patact_c.c-C-T0--var-backend.exp b/test/rlhc.d/case/patact_c.c-C-T0--var-backend.exp
index ff997125..ff997125 100644
--- a/test/cases/rlhc.d/case/patact_c.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/patact_c.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_c.c-C-T0--var-backend.in b/test/rlhc.d/case/patact_c.c-C-T0--var-backend.in
index 261710ae..261710ae 100644
--- a/test/cases/rlhc.d/case/patact_c.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/patact_c.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/patact_c.c-C-T1--goto-backend.exp b/test/rlhc.d/case/patact_c.c-C-T1--goto-backend.exp
index 9b1bb158..9b1bb158 100644
--- a/test/cases/rlhc.d/case/patact_c.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/patact_c.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_c.c-C-T1--goto-backend.in b/test/rlhc.d/case/patact_c.c-C-T1--goto-backend.in
index 5ce2f211..5ce2f211 100644
--- a/test/cases/rlhc.d/case/patact_c.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/patact_c.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/patact_c.c-C-T1--var-backend.exp b/test/rlhc.d/case/patact_c.c-C-T1--var-backend.exp
index 714d62d1..714d62d1 100644
--- a/test/cases/rlhc.d/case/patact_c.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/patact_c.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_c.c-C-T1--var-backend.in b/test/rlhc.d/case/patact_c.c-C-T1--var-backend.in
index 05247927..05247927 100644
--- a/test/cases/rlhc.d/case/patact_c.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/patact_c.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/patact_crack.crk-K-F0--var-backend.exp b/test/rlhc.d/case/patact_crack.crk-K-F0--var-backend.exp
index 684128d9..684128d9 100644
--- a/test/cases/rlhc.d/case/patact_crack.crk-K-F0--var-backend.exp
+++ b/test/rlhc.d/case/patact_crack.crk-K-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_crack.crk-K-F0--var-backend.in b/test/rlhc.d/case/patact_crack.crk-K-F0--var-backend.in
index 43493fc9..43493fc9 100644
--- a/test/cases/rlhc.d/case/patact_crack.crk-K-F0--var-backend.in
+++ b/test/rlhc.d/case/patact_crack.crk-K-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/patact_crack.crk-K-F1--var-backend.exp b/test/rlhc.d/case/patact_crack.crk-K-F1--var-backend.exp
index e6f13d42..e6f13d42 100644
--- a/test/cases/rlhc.d/case/patact_crack.crk-K-F1--var-backend.exp
+++ b/test/rlhc.d/case/patact_crack.crk-K-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_crack.crk-K-F1--var-backend.in b/test/rlhc.d/case/patact_crack.crk-K-F1--var-backend.in
index 9b98b22f..9b98b22f 100644
--- a/test/cases/rlhc.d/case/patact_crack.crk-K-F1--var-backend.in
+++ b/test/rlhc.d/case/patact_crack.crk-K-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/patact_crack.crk-K-T0--var-backend.exp b/test/rlhc.d/case/patact_crack.crk-K-T0--var-backend.exp
index 352c84a1..352c84a1 100644
--- a/test/cases/rlhc.d/case/patact_crack.crk-K-T0--var-backend.exp
+++ b/test/rlhc.d/case/patact_crack.crk-K-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_crack.crk-K-T0--var-backend.in b/test/rlhc.d/case/patact_crack.crk-K-T0--var-backend.in
index 32bbdf3a..32bbdf3a 100644
--- a/test/cases/rlhc.d/case/patact_crack.crk-K-T0--var-backend.in
+++ b/test/rlhc.d/case/patact_crack.crk-K-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/patact_crack.crk-K-T1--var-backend.exp b/test/rlhc.d/case/patact_crack.crk-K-T1--var-backend.exp
index 8edd781e..8edd781e 100644
--- a/test/cases/rlhc.d/case/patact_crack.crk-K-T1--var-backend.exp
+++ b/test/rlhc.d/case/patact_crack.crk-K-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_crack.crk-K-T1--var-backend.in b/test/rlhc.d/case/patact_crack.crk-K-T1--var-backend.in
index 6ca499e4..6ca499e4 100644
--- a/test/cases/rlhc.d/case/patact_crack.crk-K-T1--var-backend.in
+++ b/test/rlhc.d/case/patact_crack.crk-K-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/patact_cs.cs-A-F0--goto-backend.exp b/test/rlhc.d/case/patact_cs.cs-A-F0--goto-backend.exp
index f3a262eb..f3a262eb 100644
--- a/test/cases/rlhc.d/case/patact_cs.cs-A-F0--goto-backend.exp
+++ b/test/rlhc.d/case/patact_cs.cs-A-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_cs.cs-A-F0--goto-backend.in b/test/rlhc.d/case/patact_cs.cs-A-F0--goto-backend.in
index 28cada44..28cada44 100644
--- a/test/cases/rlhc.d/case/patact_cs.cs-A-F0--goto-backend.in
+++ b/test/rlhc.d/case/patact_cs.cs-A-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/patact_cs.cs-A-F0--var-backend.exp b/test/rlhc.d/case/patact_cs.cs-A-F0--var-backend.exp
index 7820ca5c..7820ca5c 100644
--- a/test/cases/rlhc.d/case/patact_cs.cs-A-F0--var-backend.exp
+++ b/test/rlhc.d/case/patact_cs.cs-A-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_cs.cs-A-F0--var-backend.in b/test/rlhc.d/case/patact_cs.cs-A-F0--var-backend.in
index 1e584f27..1e584f27 100644
--- a/test/cases/rlhc.d/case/patact_cs.cs-A-F0--var-backend.in
+++ b/test/rlhc.d/case/patact_cs.cs-A-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/patact_cs.cs-A-F1--goto-backend.exp b/test/rlhc.d/case/patact_cs.cs-A-F1--goto-backend.exp
index ffeb80dc..ffeb80dc 100644
--- a/test/cases/rlhc.d/case/patact_cs.cs-A-F1--goto-backend.exp
+++ b/test/rlhc.d/case/patact_cs.cs-A-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_cs.cs-A-F1--goto-backend.in b/test/rlhc.d/case/patact_cs.cs-A-F1--goto-backend.in
index af065ea3..af065ea3 100644
--- a/test/cases/rlhc.d/case/patact_cs.cs-A-F1--goto-backend.in
+++ b/test/rlhc.d/case/patact_cs.cs-A-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/patact_cs.cs-A-F1--var-backend.exp b/test/rlhc.d/case/patact_cs.cs-A-F1--var-backend.exp
index e1690784..e1690784 100644
--- a/test/cases/rlhc.d/case/patact_cs.cs-A-F1--var-backend.exp
+++ b/test/rlhc.d/case/patact_cs.cs-A-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_cs.cs-A-F1--var-backend.in b/test/rlhc.d/case/patact_cs.cs-A-F1--var-backend.in
index f076bca7..f076bca7 100644
--- a/test/cases/rlhc.d/case/patact_cs.cs-A-F1--var-backend.in
+++ b/test/rlhc.d/case/patact_cs.cs-A-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/patact_cs.cs-A-G0--goto-backend.exp b/test/rlhc.d/case/patact_cs.cs-A-G0--goto-backend.exp
index 4dde1031..4dde1031 100644
--- a/test/cases/rlhc.d/case/patact_cs.cs-A-G0--goto-backend.exp
+++ b/test/rlhc.d/case/patact_cs.cs-A-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_cs.cs-A-G0--goto-backend.in b/test/rlhc.d/case/patact_cs.cs-A-G0--goto-backend.in
index 560e887a..560e887a 100644
--- a/test/cases/rlhc.d/case/patact_cs.cs-A-G0--goto-backend.in
+++ b/test/rlhc.d/case/patact_cs.cs-A-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/patact_cs.cs-A-G1--goto-backend.exp b/test/rlhc.d/case/patact_cs.cs-A-G1--goto-backend.exp
index a77811ad..a77811ad 100644
--- a/test/cases/rlhc.d/case/patact_cs.cs-A-G1--goto-backend.exp
+++ b/test/rlhc.d/case/patact_cs.cs-A-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_cs.cs-A-G1--goto-backend.in b/test/rlhc.d/case/patact_cs.cs-A-G1--goto-backend.in
index 1b7f4733..1b7f4733 100644
--- a/test/cases/rlhc.d/case/patact_cs.cs-A-G1--goto-backend.in
+++ b/test/rlhc.d/case/patact_cs.cs-A-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/patact_cs.cs-A-T0--goto-backend.exp b/test/rlhc.d/case/patact_cs.cs-A-T0--goto-backend.exp
index 84bdc571..84bdc571 100644
--- a/test/cases/rlhc.d/case/patact_cs.cs-A-T0--goto-backend.exp
+++ b/test/rlhc.d/case/patact_cs.cs-A-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_cs.cs-A-T0--goto-backend.in b/test/rlhc.d/case/patact_cs.cs-A-T0--goto-backend.in
index da9f6c91..da9f6c91 100644
--- a/test/cases/rlhc.d/case/patact_cs.cs-A-T0--goto-backend.in
+++ b/test/rlhc.d/case/patact_cs.cs-A-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/patact_cs.cs-A-T0--var-backend.exp b/test/rlhc.d/case/patact_cs.cs-A-T0--var-backend.exp
index f8bbe247..f8bbe247 100644
--- a/test/cases/rlhc.d/case/patact_cs.cs-A-T0--var-backend.exp
+++ b/test/rlhc.d/case/patact_cs.cs-A-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_cs.cs-A-T0--var-backend.in b/test/rlhc.d/case/patact_cs.cs-A-T0--var-backend.in
index e034718e..e034718e 100644
--- a/test/cases/rlhc.d/case/patact_cs.cs-A-T0--var-backend.in
+++ b/test/rlhc.d/case/patact_cs.cs-A-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/patact_cs.cs-A-T1--goto-backend.exp b/test/rlhc.d/case/patact_cs.cs-A-T1--goto-backend.exp
index 2d358550..2d358550 100644
--- a/test/cases/rlhc.d/case/patact_cs.cs-A-T1--goto-backend.exp
+++ b/test/rlhc.d/case/patact_cs.cs-A-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_cs.cs-A-T1--goto-backend.in b/test/rlhc.d/case/patact_cs.cs-A-T1--goto-backend.in
index 1c02e953..1c02e953 100644
--- a/test/cases/rlhc.d/case/patact_cs.cs-A-T1--goto-backend.in
+++ b/test/rlhc.d/case/patact_cs.cs-A-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/patact_cs.cs-A-T1--var-backend.exp b/test/rlhc.d/case/patact_cs.cs-A-T1--var-backend.exp
index 651a8863..651a8863 100644
--- a/test/cases/rlhc.d/case/patact_cs.cs-A-T1--var-backend.exp
+++ b/test/rlhc.d/case/patact_cs.cs-A-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_cs.cs-A-T1--var-backend.in b/test/rlhc.d/case/patact_cs.cs-A-T1--var-backend.in
index 6e66faac..6e66faac 100644
--- a/test/cases/rlhc.d/case/patact_cs.cs-A-T1--var-backend.in
+++ b/test/rlhc.d/case/patact_cs.cs-A-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/patact_go.go-Z-F0--goto-backend.exp b/test/rlhc.d/case/patact_go.go-Z-F0--goto-backend.exp
index 919c8229..919c8229 100644
--- a/test/cases/rlhc.d/case/patact_go.go-Z-F0--goto-backend.exp
+++ b/test/rlhc.d/case/patact_go.go-Z-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_go.go-Z-F0--goto-backend.in b/test/rlhc.d/case/patact_go.go-Z-F0--goto-backend.in
index b9bb8ede..b9bb8ede 100644
--- a/test/cases/rlhc.d/case/patact_go.go-Z-F0--goto-backend.in
+++ b/test/rlhc.d/case/patact_go.go-Z-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/patact_go.go-Z-F0--var-backend.exp b/test/rlhc.d/case/patact_go.go-Z-F0--var-backend.exp
index 887b4a53..887b4a53 100644
--- a/test/cases/rlhc.d/case/patact_go.go-Z-F0--var-backend.exp
+++ b/test/rlhc.d/case/patact_go.go-Z-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_go.go-Z-F0--var-backend.in b/test/rlhc.d/case/patact_go.go-Z-F0--var-backend.in
index 39372ae1..39372ae1 100644
--- a/test/cases/rlhc.d/case/patact_go.go-Z-F0--var-backend.in
+++ b/test/rlhc.d/case/patact_go.go-Z-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/patact_go.go-Z-F1--goto-backend.exp b/test/rlhc.d/case/patact_go.go-Z-F1--goto-backend.exp
index 4fedb54e..4fedb54e 100644
--- a/test/cases/rlhc.d/case/patact_go.go-Z-F1--goto-backend.exp
+++ b/test/rlhc.d/case/patact_go.go-Z-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_go.go-Z-F1--goto-backend.in b/test/rlhc.d/case/patact_go.go-Z-F1--goto-backend.in
index a8b4e7d6..a8b4e7d6 100644
--- a/test/cases/rlhc.d/case/patact_go.go-Z-F1--goto-backend.in
+++ b/test/rlhc.d/case/patact_go.go-Z-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/patact_go.go-Z-F1--var-backend.exp b/test/rlhc.d/case/patact_go.go-Z-F1--var-backend.exp
index 1aacab26..1aacab26 100644
--- a/test/cases/rlhc.d/case/patact_go.go-Z-F1--var-backend.exp
+++ b/test/rlhc.d/case/patact_go.go-Z-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_go.go-Z-F1--var-backend.in b/test/rlhc.d/case/patact_go.go-Z-F1--var-backend.in
index ae37b981..ae37b981 100644
--- a/test/cases/rlhc.d/case/patact_go.go-Z-F1--var-backend.in
+++ b/test/rlhc.d/case/patact_go.go-Z-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/patact_go.go-Z-G0--goto-backend.exp b/test/rlhc.d/case/patact_go.go-Z-G0--goto-backend.exp
index 50f2a97b..50f2a97b 100644
--- a/test/cases/rlhc.d/case/patact_go.go-Z-G0--goto-backend.exp
+++ b/test/rlhc.d/case/patact_go.go-Z-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_go.go-Z-G0--goto-backend.in b/test/rlhc.d/case/patact_go.go-Z-G0--goto-backend.in
index 1ba209fd..1ba209fd 100644
--- a/test/cases/rlhc.d/case/patact_go.go-Z-G0--goto-backend.in
+++ b/test/rlhc.d/case/patact_go.go-Z-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/patact_go.go-Z-G1--goto-backend.exp b/test/rlhc.d/case/patact_go.go-Z-G1--goto-backend.exp
index 6c969f7a..6c969f7a 100644
--- a/test/cases/rlhc.d/case/patact_go.go-Z-G1--goto-backend.exp
+++ b/test/rlhc.d/case/patact_go.go-Z-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_go.go-Z-G1--goto-backend.in b/test/rlhc.d/case/patact_go.go-Z-G1--goto-backend.in
index 72c39cc0..72c39cc0 100644
--- a/test/cases/rlhc.d/case/patact_go.go-Z-G1--goto-backend.in
+++ b/test/rlhc.d/case/patact_go.go-Z-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/patact_go.go-Z-G2--goto-backend.exp b/test/rlhc.d/case/patact_go.go-Z-G2--goto-backend.exp
index 6dd3bfe9..6dd3bfe9 100644
--- a/test/cases/rlhc.d/case/patact_go.go-Z-G2--goto-backend.exp
+++ b/test/rlhc.d/case/patact_go.go-Z-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_go.go-Z-G2--goto-backend.in b/test/rlhc.d/case/patact_go.go-Z-G2--goto-backend.in
index 3ecc276e..3ecc276e 100644
--- a/test/cases/rlhc.d/case/patact_go.go-Z-G2--goto-backend.in
+++ b/test/rlhc.d/case/patact_go.go-Z-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/patact_go.go-Z-T0--goto-backend.exp b/test/rlhc.d/case/patact_go.go-Z-T0--goto-backend.exp
index 9ad7f981..9ad7f981 100644
--- a/test/cases/rlhc.d/case/patact_go.go-Z-T0--goto-backend.exp
+++ b/test/rlhc.d/case/patact_go.go-Z-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_go.go-Z-T0--goto-backend.in b/test/rlhc.d/case/patact_go.go-Z-T0--goto-backend.in
index f60c8583..f60c8583 100644
--- a/test/cases/rlhc.d/case/patact_go.go-Z-T0--goto-backend.in
+++ b/test/rlhc.d/case/patact_go.go-Z-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/patact_go.go-Z-T0--var-backend.exp b/test/rlhc.d/case/patact_go.go-Z-T0--var-backend.exp
index becd05df..becd05df 100644
--- a/test/cases/rlhc.d/case/patact_go.go-Z-T0--var-backend.exp
+++ b/test/rlhc.d/case/patact_go.go-Z-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_go.go-Z-T0--var-backend.in b/test/rlhc.d/case/patact_go.go-Z-T0--var-backend.in
index 3802d629..3802d629 100644
--- a/test/cases/rlhc.d/case/patact_go.go-Z-T0--var-backend.in
+++ b/test/rlhc.d/case/patact_go.go-Z-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/patact_go.go-Z-T1--goto-backend.exp b/test/rlhc.d/case/patact_go.go-Z-T1--goto-backend.exp
index a9493300..a9493300 100644
--- a/test/cases/rlhc.d/case/patact_go.go-Z-T1--goto-backend.exp
+++ b/test/rlhc.d/case/patact_go.go-Z-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_go.go-Z-T1--goto-backend.in b/test/rlhc.d/case/patact_go.go-Z-T1--goto-backend.in
index 46d4d511..46d4d511 100644
--- a/test/cases/rlhc.d/case/patact_go.go-Z-T1--goto-backend.in
+++ b/test/rlhc.d/case/patact_go.go-Z-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/patact_go.go-Z-T1--var-backend.exp b/test/rlhc.d/case/patact_go.go-Z-T1--var-backend.exp
index 273fbbae..273fbbae 100644
--- a/test/cases/rlhc.d/case/patact_go.go-Z-T1--var-backend.exp
+++ b/test/rlhc.d/case/patact_go.go-Z-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_go.go-Z-T1--var-backend.in b/test/rlhc.d/case/patact_go.go-Z-T1--var-backend.in
index 69b20c51..69b20c51 100644
--- a/test/cases/rlhc.d/case/patact_go.go-Z-T1--var-backend.in
+++ b/test/rlhc.d/case/patact_go.go-Z-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/patact_java.java-J-F0--goto-backend.exp b/test/rlhc.d/case/patact_java.java-J-F0--goto-backend.exp
index 3eef4e6f..3eef4e6f 100644
--- a/test/cases/rlhc.d/case/patact_java.java-J-F0--goto-backend.exp
+++ b/test/rlhc.d/case/patact_java.java-J-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_java.java-J-F0--goto-backend.in b/test/rlhc.d/case/patact_java.java-J-F0--goto-backend.in
index 2f676a3d..2f676a3d 100644
--- a/test/cases/rlhc.d/case/patact_java.java-J-F0--goto-backend.in
+++ b/test/rlhc.d/case/patact_java.java-J-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/patact_java.java-J-F0--var-backend.exp b/test/rlhc.d/case/patact_java.java-J-F0--var-backend.exp
index e14db284..e14db284 100644
--- a/test/cases/rlhc.d/case/patact_java.java-J-F0--var-backend.exp
+++ b/test/rlhc.d/case/patact_java.java-J-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_java.java-J-F0--var-backend.in b/test/rlhc.d/case/patact_java.java-J-F0--var-backend.in
index a3ffba42..a3ffba42 100644
--- a/test/cases/rlhc.d/case/patact_java.java-J-F0--var-backend.in
+++ b/test/rlhc.d/case/patact_java.java-J-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/patact_java.java-J-F1--goto-backend.exp b/test/rlhc.d/case/patact_java.java-J-F1--goto-backend.exp
index f34344af..f34344af 100644
--- a/test/cases/rlhc.d/case/patact_java.java-J-F1--goto-backend.exp
+++ b/test/rlhc.d/case/patact_java.java-J-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_java.java-J-F1--goto-backend.in b/test/rlhc.d/case/patact_java.java-J-F1--goto-backend.in
index 511a2812..511a2812 100644
--- a/test/cases/rlhc.d/case/patact_java.java-J-F1--goto-backend.in
+++ b/test/rlhc.d/case/patact_java.java-J-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/patact_java.java-J-F1--var-backend.exp b/test/rlhc.d/case/patact_java.java-J-F1--var-backend.exp
index 9784b9b2..9784b9b2 100644
--- a/test/cases/rlhc.d/case/patact_java.java-J-F1--var-backend.exp
+++ b/test/rlhc.d/case/patact_java.java-J-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_java.java-J-F1--var-backend.in b/test/rlhc.d/case/patact_java.java-J-F1--var-backend.in
index b1e13735..b1e13735 100644
--- a/test/cases/rlhc.d/case/patact_java.java-J-F1--var-backend.in
+++ b/test/rlhc.d/case/patact_java.java-J-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/patact_java.java-J-T0--goto-backend.exp b/test/rlhc.d/case/patact_java.java-J-T0--goto-backend.exp
index b2e49330..b2e49330 100644
--- a/test/cases/rlhc.d/case/patact_java.java-J-T0--goto-backend.exp
+++ b/test/rlhc.d/case/patact_java.java-J-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_java.java-J-T0--goto-backend.in b/test/rlhc.d/case/patact_java.java-J-T0--goto-backend.in
index 61cb11f9..61cb11f9 100644
--- a/test/cases/rlhc.d/case/patact_java.java-J-T0--goto-backend.in
+++ b/test/rlhc.d/case/patact_java.java-J-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/patact_java.java-J-T0--var-backend.exp b/test/rlhc.d/case/patact_java.java-J-T0--var-backend.exp
index 99223539..99223539 100644
--- a/test/cases/rlhc.d/case/patact_java.java-J-T0--var-backend.exp
+++ b/test/rlhc.d/case/patact_java.java-J-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_java.java-J-T0--var-backend.in b/test/rlhc.d/case/patact_java.java-J-T0--var-backend.in
index bc58a060..bc58a060 100644
--- a/test/cases/rlhc.d/case/patact_java.java-J-T0--var-backend.in
+++ b/test/rlhc.d/case/patact_java.java-J-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/patact_java.java-J-T1--goto-backend.exp b/test/rlhc.d/case/patact_java.java-J-T1--goto-backend.exp
index 5679940d..5679940d 100644
--- a/test/cases/rlhc.d/case/patact_java.java-J-T1--goto-backend.exp
+++ b/test/rlhc.d/case/patact_java.java-J-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_java.java-J-T1--goto-backend.in b/test/rlhc.d/case/patact_java.java-J-T1--goto-backend.in
index c794e21b..c794e21b 100644
--- a/test/cases/rlhc.d/case/patact_java.java-J-T1--goto-backend.in
+++ b/test/rlhc.d/case/patact_java.java-J-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/patact_java.java-J-T1--var-backend.exp b/test/rlhc.d/case/patact_java.java-J-T1--var-backend.exp
index 99de0397..99de0397 100644
--- a/test/cases/rlhc.d/case/patact_java.java-J-T1--var-backend.exp
+++ b/test/rlhc.d/case/patact_java.java-J-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_java.java-J-T1--var-backend.in b/test/rlhc.d/case/patact_java.java-J-T1--var-backend.in
index 69250872..69250872 100644
--- a/test/cases/rlhc.d/case/patact_java.java-J-T1--var-backend.in
+++ b/test/rlhc.d/case/patact_java.java-J-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/patact_julia.jl-Y-F0--var-backend.exp b/test/rlhc.d/case/patact_julia.jl-Y-F0--var-backend.exp
index 9c691092..9c691092 100644
--- a/test/cases/rlhc.d/case/patact_julia.jl-Y-F0--var-backend.exp
+++ b/test/rlhc.d/case/patact_julia.jl-Y-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_julia.jl-Y-F0--var-backend.in b/test/rlhc.d/case/patact_julia.jl-Y-F0--var-backend.in
index 81d3be7b..81d3be7b 100644
--- a/test/cases/rlhc.d/case/patact_julia.jl-Y-F0--var-backend.in
+++ b/test/rlhc.d/case/patact_julia.jl-Y-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/patact_julia.jl-Y-F1--var-backend.exp b/test/rlhc.d/case/patact_julia.jl-Y-F1--var-backend.exp
index c7cb278e..c7cb278e 100644
--- a/test/cases/rlhc.d/case/patact_julia.jl-Y-F1--var-backend.exp
+++ b/test/rlhc.d/case/patact_julia.jl-Y-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_julia.jl-Y-F1--var-backend.in b/test/rlhc.d/case/patact_julia.jl-Y-F1--var-backend.in
index fba9e3e7..fba9e3e7 100644
--- a/test/cases/rlhc.d/case/patact_julia.jl-Y-F1--var-backend.in
+++ b/test/rlhc.d/case/patact_julia.jl-Y-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/patact_julia.jl-Y-T0--var-backend.exp b/test/rlhc.d/case/patact_julia.jl-Y-T0--var-backend.exp
index e228c3fb..e228c3fb 100644
--- a/test/cases/rlhc.d/case/patact_julia.jl-Y-T0--var-backend.exp
+++ b/test/rlhc.d/case/patact_julia.jl-Y-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_julia.jl-Y-T0--var-backend.in b/test/rlhc.d/case/patact_julia.jl-Y-T0--var-backend.in
index 02650b3f..02650b3f 100644
--- a/test/cases/rlhc.d/case/patact_julia.jl-Y-T0--var-backend.in
+++ b/test/rlhc.d/case/patact_julia.jl-Y-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/patact_julia.jl-Y-T1--var-backend.exp b/test/rlhc.d/case/patact_julia.jl-Y-T1--var-backend.exp
index ab4e62f9..ab4e62f9 100644
--- a/test/cases/rlhc.d/case/patact_julia.jl-Y-T1--var-backend.exp
+++ b/test/rlhc.d/case/patact_julia.jl-Y-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_julia.jl-Y-T1--var-backend.in b/test/rlhc.d/case/patact_julia.jl-Y-T1--var-backend.in
index f71571a4..f71571a4 100644
--- a/test/cases/rlhc.d/case/patact_julia.jl-Y-T1--var-backend.in
+++ b/test/rlhc.d/case/patact_julia.jl-Y-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/patact_ocaml.ml-O-F0--var-backend.exp b/test/rlhc.d/case/patact_ocaml.ml-O-F0--var-backend.exp
index 47001bc4..47001bc4 100644
--- a/test/cases/rlhc.d/case/patact_ocaml.ml-O-F0--var-backend.exp
+++ b/test/rlhc.d/case/patact_ocaml.ml-O-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_ocaml.ml-O-F0--var-backend.in b/test/rlhc.d/case/patact_ocaml.ml-O-F0--var-backend.in
index aa867dc6..aa867dc6 100644
--- a/test/cases/rlhc.d/case/patact_ocaml.ml-O-F0--var-backend.in
+++ b/test/rlhc.d/case/patact_ocaml.ml-O-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/patact_ocaml.ml-O-F1--var-backend.exp b/test/rlhc.d/case/patact_ocaml.ml-O-F1--var-backend.exp
index d9cbe631..d9cbe631 100644
--- a/test/cases/rlhc.d/case/patact_ocaml.ml-O-F1--var-backend.exp
+++ b/test/rlhc.d/case/patact_ocaml.ml-O-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_ocaml.ml-O-F1--var-backend.in b/test/rlhc.d/case/patact_ocaml.ml-O-F1--var-backend.in
index 61b57b49..61b57b49 100644
--- a/test/cases/rlhc.d/case/patact_ocaml.ml-O-F1--var-backend.in
+++ b/test/rlhc.d/case/patact_ocaml.ml-O-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/patact_ocaml.ml-O-T0--var-backend.exp b/test/rlhc.d/case/patact_ocaml.ml-O-T0--var-backend.exp
index 6eaff016..6eaff016 100644
--- a/test/cases/rlhc.d/case/patact_ocaml.ml-O-T0--var-backend.exp
+++ b/test/rlhc.d/case/patact_ocaml.ml-O-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_ocaml.ml-O-T0--var-backend.in b/test/rlhc.d/case/patact_ocaml.ml-O-T0--var-backend.in
index 95cb5427..95cb5427 100644
--- a/test/cases/rlhc.d/case/patact_ocaml.ml-O-T0--var-backend.in
+++ b/test/rlhc.d/case/patact_ocaml.ml-O-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/patact_ocaml.ml-O-T1--var-backend.exp b/test/rlhc.d/case/patact_ocaml.ml-O-T1--var-backend.exp
index 1551e059..1551e059 100644
--- a/test/cases/rlhc.d/case/patact_ocaml.ml-O-T1--var-backend.exp
+++ b/test/rlhc.d/case/patact_ocaml.ml-O-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_ocaml.ml-O-T1--var-backend.in b/test/rlhc.d/case/patact_ocaml.ml-O-T1--var-backend.in
index c7c5e07d..c7c5e07d 100644
--- a/test/cases/rlhc.d/case/patact_ocaml.ml-O-T1--var-backend.in
+++ b/test/rlhc.d/case/patact_ocaml.ml-O-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/patact_ruby.rb-R-F0--var-backend.exp b/test/rlhc.d/case/patact_ruby.rb-R-F0--var-backend.exp
index 0e4736b2..0e4736b2 100644
--- a/test/cases/rlhc.d/case/patact_ruby.rb-R-F0--var-backend.exp
+++ b/test/rlhc.d/case/patact_ruby.rb-R-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_ruby.rb-R-F0--var-backend.in b/test/rlhc.d/case/patact_ruby.rb-R-F0--var-backend.in
index 8af12c9f..8af12c9f 100644
--- a/test/cases/rlhc.d/case/patact_ruby.rb-R-F0--var-backend.in
+++ b/test/rlhc.d/case/patact_ruby.rb-R-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/patact_ruby.rb-R-F1--var-backend.exp b/test/rlhc.d/case/patact_ruby.rb-R-F1--var-backend.exp
index e7e1ca6e..e7e1ca6e 100644
--- a/test/cases/rlhc.d/case/patact_ruby.rb-R-F1--var-backend.exp
+++ b/test/rlhc.d/case/patact_ruby.rb-R-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_ruby.rb-R-F1--var-backend.in b/test/rlhc.d/case/patact_ruby.rb-R-F1--var-backend.in
index b810ea31..b810ea31 100644
--- a/test/cases/rlhc.d/case/patact_ruby.rb-R-F1--var-backend.in
+++ b/test/rlhc.d/case/patact_ruby.rb-R-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/patact_ruby.rb-R-T0--var-backend.exp b/test/rlhc.d/case/patact_ruby.rb-R-T0--var-backend.exp
index 75024c23..75024c23 100644
--- a/test/cases/rlhc.d/case/patact_ruby.rb-R-T0--var-backend.exp
+++ b/test/rlhc.d/case/patact_ruby.rb-R-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_ruby.rb-R-T0--var-backend.in b/test/rlhc.d/case/patact_ruby.rb-R-T0--var-backend.in
index a6858161..a6858161 100644
--- a/test/cases/rlhc.d/case/patact_ruby.rb-R-T0--var-backend.in
+++ b/test/rlhc.d/case/patact_ruby.rb-R-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/patact_ruby.rb-R-T1--var-backend.exp b/test/rlhc.d/case/patact_ruby.rb-R-T1--var-backend.exp
index 1a6e4db9..1a6e4db9 100644
--- a/test/cases/rlhc.d/case/patact_ruby.rb-R-T1--var-backend.exp
+++ b/test/rlhc.d/case/patact_ruby.rb-R-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_ruby.rb-R-T1--var-backend.in b/test/rlhc.d/case/patact_ruby.rb-R-T1--var-backend.in
index 406d1d25..406d1d25 100644
--- a/test/cases/rlhc.d/case/patact_ruby.rb-R-T1--var-backend.in
+++ b/test/rlhc.d/case/patact_ruby.rb-R-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/patact_rust.rs-U-F0--var-backend.exp b/test/rlhc.d/case/patact_rust.rs-U-F0--var-backend.exp
index ecc58e68..ecc58e68 100644
--- a/test/cases/rlhc.d/case/patact_rust.rs-U-F0--var-backend.exp
+++ b/test/rlhc.d/case/patact_rust.rs-U-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_rust.rs-U-F0--var-backend.in b/test/rlhc.d/case/patact_rust.rs-U-F0--var-backend.in
index 5e62efa0..5e62efa0 100644
--- a/test/cases/rlhc.d/case/patact_rust.rs-U-F0--var-backend.in
+++ b/test/rlhc.d/case/patact_rust.rs-U-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/patact_rust.rs-U-F1--var-backend.exp b/test/rlhc.d/case/patact_rust.rs-U-F1--var-backend.exp
index 98d56911..98d56911 100644
--- a/test/cases/rlhc.d/case/patact_rust.rs-U-F1--var-backend.exp
+++ b/test/rlhc.d/case/patact_rust.rs-U-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_rust.rs-U-F1--var-backend.in b/test/rlhc.d/case/patact_rust.rs-U-F1--var-backend.in
index 34f20b6b..34f20b6b 100644
--- a/test/cases/rlhc.d/case/patact_rust.rs-U-F1--var-backend.in
+++ b/test/rlhc.d/case/patact_rust.rs-U-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/patact_rust.rs-U-T0--var-backend.exp b/test/rlhc.d/case/patact_rust.rs-U-T0--var-backend.exp
index fd3aa001..fd3aa001 100644
--- a/test/cases/rlhc.d/case/patact_rust.rs-U-T0--var-backend.exp
+++ b/test/rlhc.d/case/patact_rust.rs-U-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_rust.rs-U-T0--var-backend.in b/test/rlhc.d/case/patact_rust.rs-U-T0--var-backend.in
index 3df9cbaa..3df9cbaa 100644
--- a/test/cases/rlhc.d/case/patact_rust.rs-U-T0--var-backend.in
+++ b/test/rlhc.d/case/patact_rust.rs-U-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/patact_rust.rs-U-T1--var-backend.exp b/test/rlhc.d/case/patact_rust.rs-U-T1--var-backend.exp
index 35f4d38b..35f4d38b 100644
--- a/test/cases/rlhc.d/case/patact_rust.rs-U-T1--var-backend.exp
+++ b/test/rlhc.d/case/patact_rust.rs-U-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/patact_rust.rs-U-T1--var-backend.in b/test/rlhc.d/case/patact_rust.rs-U-T1--var-backend.in
index 12340724..12340724 100644
--- a/test/cases/rlhc.d/case/patact_rust.rs-U-T1--var-backend.in
+++ b/test/rlhc.d/case/patact_rust.rs-U-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/range.c-C-F0--goto-backend.exp b/test/rlhc.d/case/range.c-C-F0--goto-backend.exp
index 49ff541a..49ff541a 100644
--- a/test/cases/rlhc.d/case/range.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/range.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/range.c-C-F0--goto-backend.in b/test/rlhc.d/case/range.c-C-F0--goto-backend.in
index 70c00aa9..70c00aa9 100644
--- a/test/cases/rlhc.d/case/range.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/range.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/range.c-C-F0--var-backend.exp b/test/rlhc.d/case/range.c-C-F0--var-backend.exp
index 3541628c..3541628c 100644
--- a/test/cases/rlhc.d/case/range.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/range.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/range.c-C-F0--var-backend.in b/test/rlhc.d/case/range.c-C-F0--var-backend.in
index 7cd08263..7cd08263 100644
--- a/test/cases/rlhc.d/case/range.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/range.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/range.c-C-F1--goto-backend.exp b/test/rlhc.d/case/range.c-C-F1--goto-backend.exp
index 6145d1fe..6145d1fe 100644
--- a/test/cases/rlhc.d/case/range.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/range.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/range.c-C-F1--goto-backend.in b/test/rlhc.d/case/range.c-C-F1--goto-backend.in
index 0e8f6a9c..0e8f6a9c 100644
--- a/test/cases/rlhc.d/case/range.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/range.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/range.c-C-F1--var-backend.exp b/test/rlhc.d/case/range.c-C-F1--var-backend.exp
index 3541628c..3541628c 100644
--- a/test/cases/rlhc.d/case/range.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/range.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/range.c-C-F1--var-backend.in b/test/rlhc.d/case/range.c-C-F1--var-backend.in
index 7cd08263..7cd08263 100644
--- a/test/cases/rlhc.d/case/range.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/range.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/range.c-C-G0--goto-backend.exp b/test/rlhc.d/case/range.c-C-G0--goto-backend.exp
index b252ebcd..b252ebcd 100644
--- a/test/cases/rlhc.d/case/range.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/range.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/range.c-C-G0--goto-backend.in b/test/rlhc.d/case/range.c-C-G0--goto-backend.in
index 0e9025bf..0e9025bf 100644
--- a/test/cases/rlhc.d/case/range.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/range.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/range.c-C-G1--goto-backend.exp b/test/rlhc.d/case/range.c-C-G1--goto-backend.exp
index 39397118..39397118 100644
--- a/test/cases/rlhc.d/case/range.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/range.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/range.c-C-G1--goto-backend.in b/test/rlhc.d/case/range.c-C-G1--goto-backend.in
index ea9b0392..ea9b0392 100644
--- a/test/cases/rlhc.d/case/range.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/range.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/range.c-C-G2--goto-backend.exp b/test/rlhc.d/case/range.c-C-G2--goto-backend.exp
index 9c45bfe8..9c45bfe8 100644
--- a/test/cases/rlhc.d/case/range.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/range.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/range.c-C-G2--goto-backend.in b/test/rlhc.d/case/range.c-C-G2--goto-backend.in
index c24084e7..c24084e7 100644
--- a/test/cases/rlhc.d/case/range.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/range.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/range.c-C-T0--goto-backend.exp b/test/rlhc.d/case/range.c-C-T0--goto-backend.exp
index 521c6ec4..521c6ec4 100644
--- a/test/cases/rlhc.d/case/range.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/range.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/range.c-C-T0--goto-backend.in b/test/rlhc.d/case/range.c-C-T0--goto-backend.in
index 5653ab9f..5653ab9f 100644
--- a/test/cases/rlhc.d/case/range.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/range.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/range.c-C-T0--var-backend.exp b/test/rlhc.d/case/range.c-C-T0--var-backend.exp
index 965c12f9..965c12f9 100644
--- a/test/cases/rlhc.d/case/range.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/range.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/range.c-C-T0--var-backend.in b/test/rlhc.d/case/range.c-C-T0--var-backend.in
index 68b23a58..68b23a58 100644
--- a/test/cases/rlhc.d/case/range.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/range.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/range.c-C-T1--goto-backend.exp b/test/rlhc.d/case/range.c-C-T1--goto-backend.exp
index deddd393..deddd393 100644
--- a/test/cases/rlhc.d/case/range.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/range.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/range.c-C-T1--goto-backend.in b/test/rlhc.d/case/range.c-C-T1--goto-backend.in
index 3589a5cb..3589a5cb 100644
--- a/test/cases/rlhc.d/case/range.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/range.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/range.c-C-T1--var-backend.exp b/test/rlhc.d/case/range.c-C-T1--var-backend.exp
index 99f7fdf6..99f7fdf6 100644
--- a/test/cases/rlhc.d/case/range.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/range.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/range.c-C-T1--var-backend.in b/test/rlhc.d/case/range.c-C-T1--var-backend.in
index 52a4630a..52a4630a 100644
--- a/test/cases/rlhc.d/case/range.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/range.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_c.c-C-F0--goto-backend.exp b/test/rlhc.d/case/rangei_c.c-C-F0--goto-backend.exp
index 190995af..190995af 100644
--- a/test/cases/rlhc.d/case/rangei_c.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/rangei_c.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_c.c-C-F0--goto-backend.in b/test/rlhc.d/case/rangei_c.c-C-F0--goto-backend.in
index 4af4d304..4af4d304 100644
--- a/test/cases/rlhc.d/case/rangei_c.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/rangei_c.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_c.c-C-F0--var-backend.exp b/test/rlhc.d/case/rangei_c.c-C-F0--var-backend.exp
index eca1b404..eca1b404 100644
--- a/test/cases/rlhc.d/case/rangei_c.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/rangei_c.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_c.c-C-F0--var-backend.in b/test/rlhc.d/case/rangei_c.c-C-F0--var-backend.in
index bd6df66e..bd6df66e 100644
--- a/test/cases/rlhc.d/case/rangei_c.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/rangei_c.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_c.c-C-F1--goto-backend.exp b/test/rlhc.d/case/rangei_c.c-C-F1--goto-backend.exp
index f456a72e..f456a72e 100644
--- a/test/cases/rlhc.d/case/rangei_c.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/rangei_c.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_c.c-C-F1--goto-backend.in b/test/rlhc.d/case/rangei_c.c-C-F1--goto-backend.in
index 83ba727a..83ba727a 100644
--- a/test/cases/rlhc.d/case/rangei_c.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/rangei_c.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_c.c-C-F1--var-backend.exp b/test/rlhc.d/case/rangei_c.c-C-F1--var-backend.exp
index eca1b404..eca1b404 100644
--- a/test/cases/rlhc.d/case/rangei_c.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/rangei_c.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_c.c-C-F1--var-backend.in b/test/rlhc.d/case/rangei_c.c-C-F1--var-backend.in
index bd6df66e..bd6df66e 100644
--- a/test/cases/rlhc.d/case/rangei_c.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/rangei_c.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_c.c-C-G0--goto-backend.exp b/test/rlhc.d/case/rangei_c.c-C-G0--goto-backend.exp
index 7318d6db..7318d6db 100644
--- a/test/cases/rlhc.d/case/rangei_c.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/rangei_c.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_c.c-C-G0--goto-backend.in b/test/rlhc.d/case/rangei_c.c-C-G0--goto-backend.in
index 6c440ce3..6c440ce3 100644
--- a/test/cases/rlhc.d/case/rangei_c.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/rangei_c.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_c.c-C-G1--goto-backend.exp b/test/rlhc.d/case/rangei_c.c-C-G1--goto-backend.exp
index 4166bcd8..4166bcd8 100644
--- a/test/cases/rlhc.d/case/rangei_c.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/rangei_c.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_c.c-C-G1--goto-backend.in b/test/rlhc.d/case/rangei_c.c-C-G1--goto-backend.in
index afc9ee53..afc9ee53 100644
--- a/test/cases/rlhc.d/case/rangei_c.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/rangei_c.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_c.c-C-G2--goto-backend.exp b/test/rlhc.d/case/rangei_c.c-C-G2--goto-backend.exp
index a563c0dd..a563c0dd 100644
--- a/test/cases/rlhc.d/case/rangei_c.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/rangei_c.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_c.c-C-G2--goto-backend.in b/test/rlhc.d/case/rangei_c.c-C-G2--goto-backend.in
index 60597179..60597179 100644
--- a/test/cases/rlhc.d/case/rangei_c.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/rangei_c.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_c.c-C-T0--goto-backend.exp b/test/rlhc.d/case/rangei_c.c-C-T0--goto-backend.exp
index 5668be4c..5668be4c 100644
--- a/test/cases/rlhc.d/case/rangei_c.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/rangei_c.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_c.c-C-T0--goto-backend.in b/test/rlhc.d/case/rangei_c.c-C-T0--goto-backend.in
index 91515d5d..91515d5d 100644
--- a/test/cases/rlhc.d/case/rangei_c.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/rangei_c.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_c.c-C-T0--var-backend.exp b/test/rlhc.d/case/rangei_c.c-C-T0--var-backend.exp
index 54bca615..54bca615 100644
--- a/test/cases/rlhc.d/case/rangei_c.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/rangei_c.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_c.c-C-T0--var-backend.in b/test/rlhc.d/case/rangei_c.c-C-T0--var-backend.in
index 477dd516..477dd516 100644
--- a/test/cases/rlhc.d/case/rangei_c.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/rangei_c.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_c.c-C-T1--goto-backend.exp b/test/rlhc.d/case/rangei_c.c-C-T1--goto-backend.exp
index 51c9de24..51c9de24 100644
--- a/test/cases/rlhc.d/case/rangei_c.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/rangei_c.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_c.c-C-T1--goto-backend.in b/test/rlhc.d/case/rangei_c.c-C-T1--goto-backend.in
index ee45f081..ee45f081 100644
--- a/test/cases/rlhc.d/case/rangei_c.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/rangei_c.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_c.c-C-T1--var-backend.exp b/test/rlhc.d/case/rangei_c.c-C-T1--var-backend.exp
index 7ecf5d1d..7ecf5d1d 100644
--- a/test/cases/rlhc.d/case/rangei_c.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/rangei_c.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_c.c-C-T1--var-backend.in b/test/rlhc.d/case/rangei_c.c-C-T1--var-backend.in
index 39207eeb..39207eeb 100644
--- a/test/cases/rlhc.d/case/rangei_c.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/rangei_c.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_crack.crk-K-F0--var-backend.exp b/test/rlhc.d/case/rangei_crack.crk-K-F0--var-backend.exp
index e59b2a80..e59b2a80 100644
--- a/test/cases/rlhc.d/case/rangei_crack.crk-K-F0--var-backend.exp
+++ b/test/rlhc.d/case/rangei_crack.crk-K-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_crack.crk-K-F0--var-backend.in b/test/rlhc.d/case/rangei_crack.crk-K-F0--var-backend.in
index 9a5d7f27..9a5d7f27 100644
--- a/test/cases/rlhc.d/case/rangei_crack.crk-K-F0--var-backend.in
+++ b/test/rlhc.d/case/rangei_crack.crk-K-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_crack.crk-K-F1--var-backend.exp b/test/rlhc.d/case/rangei_crack.crk-K-F1--var-backend.exp
index e59b2a80..e59b2a80 100644
--- a/test/cases/rlhc.d/case/rangei_crack.crk-K-F1--var-backend.exp
+++ b/test/rlhc.d/case/rangei_crack.crk-K-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_crack.crk-K-F1--var-backend.in b/test/rlhc.d/case/rangei_crack.crk-K-F1--var-backend.in
index 9a5d7f27..9a5d7f27 100644
--- a/test/cases/rlhc.d/case/rangei_crack.crk-K-F1--var-backend.in
+++ b/test/rlhc.d/case/rangei_crack.crk-K-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_crack.crk-K-T0--var-backend.exp b/test/rlhc.d/case/rangei_crack.crk-K-T0--var-backend.exp
index aa17c6c5..aa17c6c5 100644
--- a/test/cases/rlhc.d/case/rangei_crack.crk-K-T0--var-backend.exp
+++ b/test/rlhc.d/case/rangei_crack.crk-K-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_crack.crk-K-T0--var-backend.in b/test/rlhc.d/case/rangei_crack.crk-K-T0--var-backend.in
index a4cdd400..a4cdd400 100644
--- a/test/cases/rlhc.d/case/rangei_crack.crk-K-T0--var-backend.in
+++ b/test/rlhc.d/case/rangei_crack.crk-K-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_crack.crk-K-T1--var-backend.exp b/test/rlhc.d/case/rangei_crack.crk-K-T1--var-backend.exp
index d95e8870..d95e8870 100644
--- a/test/cases/rlhc.d/case/rangei_crack.crk-K-T1--var-backend.exp
+++ b/test/rlhc.d/case/rangei_crack.crk-K-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_crack.crk-K-T1--var-backend.in b/test/rlhc.d/case/rangei_crack.crk-K-T1--var-backend.in
index 25a453b1..25a453b1 100644
--- a/test/cases/rlhc.d/case/rangei_crack.crk-K-T1--var-backend.in
+++ b/test/rlhc.d/case/rangei_crack.crk-K-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_cs.cs-A-F0--goto-backend.exp b/test/rlhc.d/case/rangei_cs.cs-A-F0--goto-backend.exp
index aed3b0c9..aed3b0c9 100644
--- a/test/cases/rlhc.d/case/rangei_cs.cs-A-F0--goto-backend.exp
+++ b/test/rlhc.d/case/rangei_cs.cs-A-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_cs.cs-A-F0--goto-backend.in b/test/rlhc.d/case/rangei_cs.cs-A-F0--goto-backend.in
index 5dc94354..5dc94354 100644
--- a/test/cases/rlhc.d/case/rangei_cs.cs-A-F0--goto-backend.in
+++ b/test/rlhc.d/case/rangei_cs.cs-A-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_cs.cs-A-F0--var-backend.exp b/test/rlhc.d/case/rangei_cs.cs-A-F0--var-backend.exp
index da833087..da833087 100644
--- a/test/cases/rlhc.d/case/rangei_cs.cs-A-F0--var-backend.exp
+++ b/test/rlhc.d/case/rangei_cs.cs-A-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_cs.cs-A-F0--var-backend.in b/test/rlhc.d/case/rangei_cs.cs-A-F0--var-backend.in
index fac4e638..fac4e638 100644
--- a/test/cases/rlhc.d/case/rangei_cs.cs-A-F0--var-backend.in
+++ b/test/rlhc.d/case/rangei_cs.cs-A-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_cs.cs-A-F1--goto-backend.exp b/test/rlhc.d/case/rangei_cs.cs-A-F1--goto-backend.exp
index f65b7e3c..f65b7e3c 100644
--- a/test/cases/rlhc.d/case/rangei_cs.cs-A-F1--goto-backend.exp
+++ b/test/rlhc.d/case/rangei_cs.cs-A-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_cs.cs-A-F1--goto-backend.in b/test/rlhc.d/case/rangei_cs.cs-A-F1--goto-backend.in
index f061cae4..f061cae4 100644
--- a/test/cases/rlhc.d/case/rangei_cs.cs-A-F1--goto-backend.in
+++ b/test/rlhc.d/case/rangei_cs.cs-A-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_cs.cs-A-F1--var-backend.exp b/test/rlhc.d/case/rangei_cs.cs-A-F1--var-backend.exp
index da833087..da833087 100644
--- a/test/cases/rlhc.d/case/rangei_cs.cs-A-F1--var-backend.exp
+++ b/test/rlhc.d/case/rangei_cs.cs-A-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_cs.cs-A-F1--var-backend.in b/test/rlhc.d/case/rangei_cs.cs-A-F1--var-backend.in
index fac4e638..fac4e638 100644
--- a/test/cases/rlhc.d/case/rangei_cs.cs-A-F1--var-backend.in
+++ b/test/rlhc.d/case/rangei_cs.cs-A-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_cs.cs-A-G0--goto-backend.exp b/test/rlhc.d/case/rangei_cs.cs-A-G0--goto-backend.exp
index 8bc613e4..8bc613e4 100644
--- a/test/cases/rlhc.d/case/rangei_cs.cs-A-G0--goto-backend.exp
+++ b/test/rlhc.d/case/rangei_cs.cs-A-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_cs.cs-A-G0--goto-backend.in b/test/rlhc.d/case/rangei_cs.cs-A-G0--goto-backend.in
index 293f1bb4..293f1bb4 100644
--- a/test/cases/rlhc.d/case/rangei_cs.cs-A-G0--goto-backend.in
+++ b/test/rlhc.d/case/rangei_cs.cs-A-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_cs.cs-A-G1--goto-backend.exp b/test/rlhc.d/case/rangei_cs.cs-A-G1--goto-backend.exp
index 88165bba..88165bba 100644
--- a/test/cases/rlhc.d/case/rangei_cs.cs-A-G1--goto-backend.exp
+++ b/test/rlhc.d/case/rangei_cs.cs-A-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_cs.cs-A-G1--goto-backend.in b/test/rlhc.d/case/rangei_cs.cs-A-G1--goto-backend.in
index cdc14582..cdc14582 100644
--- a/test/cases/rlhc.d/case/rangei_cs.cs-A-G1--goto-backend.in
+++ b/test/rlhc.d/case/rangei_cs.cs-A-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_cs.cs-A-T0--goto-backend.exp b/test/rlhc.d/case/rangei_cs.cs-A-T0--goto-backend.exp
index fe1b1401..fe1b1401 100644
--- a/test/cases/rlhc.d/case/rangei_cs.cs-A-T0--goto-backend.exp
+++ b/test/rlhc.d/case/rangei_cs.cs-A-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_cs.cs-A-T0--goto-backend.in b/test/rlhc.d/case/rangei_cs.cs-A-T0--goto-backend.in
index af5f5d1f..af5f5d1f 100644
--- a/test/cases/rlhc.d/case/rangei_cs.cs-A-T0--goto-backend.in
+++ b/test/rlhc.d/case/rangei_cs.cs-A-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_cs.cs-A-T0--var-backend.exp b/test/rlhc.d/case/rangei_cs.cs-A-T0--var-backend.exp
index 88005115..88005115 100644
--- a/test/cases/rlhc.d/case/rangei_cs.cs-A-T0--var-backend.exp
+++ b/test/rlhc.d/case/rangei_cs.cs-A-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_cs.cs-A-T0--var-backend.in b/test/rlhc.d/case/rangei_cs.cs-A-T0--var-backend.in
index f126fffd..f126fffd 100644
--- a/test/cases/rlhc.d/case/rangei_cs.cs-A-T0--var-backend.in
+++ b/test/rlhc.d/case/rangei_cs.cs-A-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_cs.cs-A-T1--goto-backend.exp b/test/rlhc.d/case/rangei_cs.cs-A-T1--goto-backend.exp
index 321d3359..321d3359 100644
--- a/test/cases/rlhc.d/case/rangei_cs.cs-A-T1--goto-backend.exp
+++ b/test/rlhc.d/case/rangei_cs.cs-A-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_cs.cs-A-T1--goto-backend.in b/test/rlhc.d/case/rangei_cs.cs-A-T1--goto-backend.in
index 2bbaab58..2bbaab58 100644
--- a/test/cases/rlhc.d/case/rangei_cs.cs-A-T1--goto-backend.in
+++ b/test/rlhc.d/case/rangei_cs.cs-A-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_cs.cs-A-T1--var-backend.exp b/test/rlhc.d/case/rangei_cs.cs-A-T1--var-backend.exp
index 598fcb62..598fcb62 100644
--- a/test/cases/rlhc.d/case/rangei_cs.cs-A-T1--var-backend.exp
+++ b/test/rlhc.d/case/rangei_cs.cs-A-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_cs.cs-A-T1--var-backend.in b/test/rlhc.d/case/rangei_cs.cs-A-T1--var-backend.in
index bb79b581..bb79b581 100644
--- a/test/cases/rlhc.d/case/rangei_cs.cs-A-T1--var-backend.in
+++ b/test/rlhc.d/case/rangei_cs.cs-A-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_go.go-Z-F0--goto-backend.exp b/test/rlhc.d/case/rangei_go.go-Z-F0--goto-backend.exp
index 3ff70b7a..3ff70b7a 100644
--- a/test/cases/rlhc.d/case/rangei_go.go-Z-F0--goto-backend.exp
+++ b/test/rlhc.d/case/rangei_go.go-Z-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_go.go-Z-F0--goto-backend.in b/test/rlhc.d/case/rangei_go.go-Z-F0--goto-backend.in
index 2dd93e2e..2dd93e2e 100644
--- a/test/cases/rlhc.d/case/rangei_go.go-Z-F0--goto-backend.in
+++ b/test/rlhc.d/case/rangei_go.go-Z-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_go.go-Z-F0--var-backend.exp b/test/rlhc.d/case/rangei_go.go-Z-F0--var-backend.exp
index c66cf04b..c66cf04b 100644
--- a/test/cases/rlhc.d/case/rangei_go.go-Z-F0--var-backend.exp
+++ b/test/rlhc.d/case/rangei_go.go-Z-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_go.go-Z-F0--var-backend.in b/test/rlhc.d/case/rangei_go.go-Z-F0--var-backend.in
index b0c00c48..b0c00c48 100644
--- a/test/cases/rlhc.d/case/rangei_go.go-Z-F0--var-backend.in
+++ b/test/rlhc.d/case/rangei_go.go-Z-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_go.go-Z-F1--goto-backend.exp b/test/rlhc.d/case/rangei_go.go-Z-F1--goto-backend.exp
index 3fd8fa92..3fd8fa92 100644
--- a/test/cases/rlhc.d/case/rangei_go.go-Z-F1--goto-backend.exp
+++ b/test/rlhc.d/case/rangei_go.go-Z-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_go.go-Z-F1--goto-backend.in b/test/rlhc.d/case/rangei_go.go-Z-F1--goto-backend.in
index e0132497..e0132497 100644
--- a/test/cases/rlhc.d/case/rangei_go.go-Z-F1--goto-backend.in
+++ b/test/rlhc.d/case/rangei_go.go-Z-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_go.go-Z-F1--var-backend.exp b/test/rlhc.d/case/rangei_go.go-Z-F1--var-backend.exp
index c66cf04b..c66cf04b 100644
--- a/test/cases/rlhc.d/case/rangei_go.go-Z-F1--var-backend.exp
+++ b/test/rlhc.d/case/rangei_go.go-Z-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_go.go-Z-F1--var-backend.in b/test/rlhc.d/case/rangei_go.go-Z-F1--var-backend.in
index b0c00c48..b0c00c48 100644
--- a/test/cases/rlhc.d/case/rangei_go.go-Z-F1--var-backend.in
+++ b/test/rlhc.d/case/rangei_go.go-Z-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_go.go-Z-G0--goto-backend.exp b/test/rlhc.d/case/rangei_go.go-Z-G0--goto-backend.exp
index ef4f7db9..ef4f7db9 100644
--- a/test/cases/rlhc.d/case/rangei_go.go-Z-G0--goto-backend.exp
+++ b/test/rlhc.d/case/rangei_go.go-Z-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_go.go-Z-G0--goto-backend.in b/test/rlhc.d/case/rangei_go.go-Z-G0--goto-backend.in
index 9875d3eb..9875d3eb 100644
--- a/test/cases/rlhc.d/case/rangei_go.go-Z-G0--goto-backend.in
+++ b/test/rlhc.d/case/rangei_go.go-Z-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_go.go-Z-G1--goto-backend.exp b/test/rlhc.d/case/rangei_go.go-Z-G1--goto-backend.exp
index 2cfd536e..2cfd536e 100644
--- a/test/cases/rlhc.d/case/rangei_go.go-Z-G1--goto-backend.exp
+++ b/test/rlhc.d/case/rangei_go.go-Z-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_go.go-Z-G1--goto-backend.in b/test/rlhc.d/case/rangei_go.go-Z-G1--goto-backend.in
index a904821e..a904821e 100644
--- a/test/cases/rlhc.d/case/rangei_go.go-Z-G1--goto-backend.in
+++ b/test/rlhc.d/case/rangei_go.go-Z-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_go.go-Z-G2--goto-backend.exp b/test/rlhc.d/case/rangei_go.go-Z-G2--goto-backend.exp
index 80394408..80394408 100644
--- a/test/cases/rlhc.d/case/rangei_go.go-Z-G2--goto-backend.exp
+++ b/test/rlhc.d/case/rangei_go.go-Z-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_go.go-Z-G2--goto-backend.in b/test/rlhc.d/case/rangei_go.go-Z-G2--goto-backend.in
index 32b161d2..32b161d2 100644
--- a/test/cases/rlhc.d/case/rangei_go.go-Z-G2--goto-backend.in
+++ b/test/rlhc.d/case/rangei_go.go-Z-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_go.go-Z-T0--goto-backend.exp b/test/rlhc.d/case/rangei_go.go-Z-T0--goto-backend.exp
index fd104948..fd104948 100644
--- a/test/cases/rlhc.d/case/rangei_go.go-Z-T0--goto-backend.exp
+++ b/test/rlhc.d/case/rangei_go.go-Z-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_go.go-Z-T0--goto-backend.in b/test/rlhc.d/case/rangei_go.go-Z-T0--goto-backend.in
index a2ef5fb7..a2ef5fb7 100644
--- a/test/cases/rlhc.d/case/rangei_go.go-Z-T0--goto-backend.in
+++ b/test/rlhc.d/case/rangei_go.go-Z-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_go.go-Z-T0--var-backend.exp b/test/rlhc.d/case/rangei_go.go-Z-T0--var-backend.exp
index dfb64955..dfb64955 100644
--- a/test/cases/rlhc.d/case/rangei_go.go-Z-T0--var-backend.exp
+++ b/test/rlhc.d/case/rangei_go.go-Z-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_go.go-Z-T0--var-backend.in b/test/rlhc.d/case/rangei_go.go-Z-T0--var-backend.in
index e35a2685..e35a2685 100644
--- a/test/cases/rlhc.d/case/rangei_go.go-Z-T0--var-backend.in
+++ b/test/rlhc.d/case/rangei_go.go-Z-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_go.go-Z-T1--goto-backend.exp b/test/rlhc.d/case/rangei_go.go-Z-T1--goto-backend.exp
index 7fee2898..7fee2898 100644
--- a/test/cases/rlhc.d/case/rangei_go.go-Z-T1--goto-backend.exp
+++ b/test/rlhc.d/case/rangei_go.go-Z-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_go.go-Z-T1--goto-backend.in b/test/rlhc.d/case/rangei_go.go-Z-T1--goto-backend.in
index 82eb0f17..82eb0f17 100644
--- a/test/cases/rlhc.d/case/rangei_go.go-Z-T1--goto-backend.in
+++ b/test/rlhc.d/case/rangei_go.go-Z-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_go.go-Z-T1--var-backend.exp b/test/rlhc.d/case/rangei_go.go-Z-T1--var-backend.exp
index 5056acee..5056acee 100644
--- a/test/cases/rlhc.d/case/rangei_go.go-Z-T1--var-backend.exp
+++ b/test/rlhc.d/case/rangei_go.go-Z-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_go.go-Z-T1--var-backend.in b/test/rlhc.d/case/rangei_go.go-Z-T1--var-backend.in
index 6ccbf556..6ccbf556 100644
--- a/test/cases/rlhc.d/case/rangei_go.go-Z-T1--var-backend.in
+++ b/test/rlhc.d/case/rangei_go.go-Z-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_java.java-J-F0--goto-backend.exp b/test/rlhc.d/case/rangei_java.java-J-F0--goto-backend.exp
index 34daba30..34daba30 100644
--- a/test/cases/rlhc.d/case/rangei_java.java-J-F0--goto-backend.exp
+++ b/test/rlhc.d/case/rangei_java.java-J-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_java.java-J-F0--goto-backend.in b/test/rlhc.d/case/rangei_java.java-J-F0--goto-backend.in
index 59cd0e5e..59cd0e5e 100644
--- a/test/cases/rlhc.d/case/rangei_java.java-J-F0--goto-backend.in
+++ b/test/rlhc.d/case/rangei_java.java-J-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_java.java-J-F0--var-backend.exp b/test/rlhc.d/case/rangei_java.java-J-F0--var-backend.exp
index 0460d019..0460d019 100644
--- a/test/cases/rlhc.d/case/rangei_java.java-J-F0--var-backend.exp
+++ b/test/rlhc.d/case/rangei_java.java-J-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_java.java-J-F0--var-backend.in b/test/rlhc.d/case/rangei_java.java-J-F0--var-backend.in
index e3a3af67..e3a3af67 100644
--- a/test/cases/rlhc.d/case/rangei_java.java-J-F0--var-backend.in
+++ b/test/rlhc.d/case/rangei_java.java-J-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_java.java-J-F1--goto-backend.exp b/test/rlhc.d/case/rangei_java.java-J-F1--goto-backend.exp
index c66a0ccd..c66a0ccd 100644
--- a/test/cases/rlhc.d/case/rangei_java.java-J-F1--goto-backend.exp
+++ b/test/rlhc.d/case/rangei_java.java-J-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_java.java-J-F1--goto-backend.in b/test/rlhc.d/case/rangei_java.java-J-F1--goto-backend.in
index 30810b6b..30810b6b 100644
--- a/test/cases/rlhc.d/case/rangei_java.java-J-F1--goto-backend.in
+++ b/test/rlhc.d/case/rangei_java.java-J-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_java.java-J-F1--var-backend.exp b/test/rlhc.d/case/rangei_java.java-J-F1--var-backend.exp
index 0460d019..0460d019 100644
--- a/test/cases/rlhc.d/case/rangei_java.java-J-F1--var-backend.exp
+++ b/test/rlhc.d/case/rangei_java.java-J-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_java.java-J-F1--var-backend.in b/test/rlhc.d/case/rangei_java.java-J-F1--var-backend.in
index e3a3af67..e3a3af67 100644
--- a/test/cases/rlhc.d/case/rangei_java.java-J-F1--var-backend.in
+++ b/test/rlhc.d/case/rangei_java.java-J-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_java.java-J-T0--goto-backend.exp b/test/rlhc.d/case/rangei_java.java-J-T0--goto-backend.exp
index 8180bf77..8180bf77 100644
--- a/test/cases/rlhc.d/case/rangei_java.java-J-T0--goto-backend.exp
+++ b/test/rlhc.d/case/rangei_java.java-J-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_java.java-J-T0--goto-backend.in b/test/rlhc.d/case/rangei_java.java-J-T0--goto-backend.in
index 5b637b1e..5b637b1e 100644
--- a/test/cases/rlhc.d/case/rangei_java.java-J-T0--goto-backend.in
+++ b/test/rlhc.d/case/rangei_java.java-J-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_java.java-J-T0--var-backend.exp b/test/rlhc.d/case/rangei_java.java-J-T0--var-backend.exp
index a8a7dddc..a8a7dddc 100644
--- a/test/cases/rlhc.d/case/rangei_java.java-J-T0--var-backend.exp
+++ b/test/rlhc.d/case/rangei_java.java-J-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_java.java-J-T0--var-backend.in b/test/rlhc.d/case/rangei_java.java-J-T0--var-backend.in
index 90a9fb7b..90a9fb7b 100644
--- a/test/cases/rlhc.d/case/rangei_java.java-J-T0--var-backend.in
+++ b/test/rlhc.d/case/rangei_java.java-J-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_java.java-J-T1--goto-backend.exp b/test/rlhc.d/case/rangei_java.java-J-T1--goto-backend.exp
index 88068937..88068937 100644
--- a/test/cases/rlhc.d/case/rangei_java.java-J-T1--goto-backend.exp
+++ b/test/rlhc.d/case/rangei_java.java-J-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_java.java-J-T1--goto-backend.in b/test/rlhc.d/case/rangei_java.java-J-T1--goto-backend.in
index 6326c30a..6326c30a 100644
--- a/test/cases/rlhc.d/case/rangei_java.java-J-T1--goto-backend.in
+++ b/test/rlhc.d/case/rangei_java.java-J-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_java.java-J-T1--var-backend.exp b/test/rlhc.d/case/rangei_java.java-J-T1--var-backend.exp
index f30df84c..f30df84c 100644
--- a/test/cases/rlhc.d/case/rangei_java.java-J-T1--var-backend.exp
+++ b/test/rlhc.d/case/rangei_java.java-J-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_java.java-J-T1--var-backend.in b/test/rlhc.d/case/rangei_java.java-J-T1--var-backend.in
index d06b35ca..d06b35ca 100644
--- a/test/cases/rlhc.d/case/rangei_java.java-J-T1--var-backend.in
+++ b/test/rlhc.d/case/rangei_java.java-J-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_julia.jl-Y-F0--var-backend.exp b/test/rlhc.d/case/rangei_julia.jl-Y-F0--var-backend.exp
index 3f1d6320..3f1d6320 100644
--- a/test/cases/rlhc.d/case/rangei_julia.jl-Y-F0--var-backend.exp
+++ b/test/rlhc.d/case/rangei_julia.jl-Y-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_julia.jl-Y-F0--var-backend.in b/test/rlhc.d/case/rangei_julia.jl-Y-F0--var-backend.in
index 350ddfe8..350ddfe8 100644
--- a/test/cases/rlhc.d/case/rangei_julia.jl-Y-F0--var-backend.in
+++ b/test/rlhc.d/case/rangei_julia.jl-Y-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_julia.jl-Y-F1--var-backend.exp b/test/rlhc.d/case/rangei_julia.jl-Y-F1--var-backend.exp
index 3f1d6320..3f1d6320 100644
--- a/test/cases/rlhc.d/case/rangei_julia.jl-Y-F1--var-backend.exp
+++ b/test/rlhc.d/case/rangei_julia.jl-Y-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_julia.jl-Y-F1--var-backend.in b/test/rlhc.d/case/rangei_julia.jl-Y-F1--var-backend.in
index 350ddfe8..350ddfe8 100644
--- a/test/cases/rlhc.d/case/rangei_julia.jl-Y-F1--var-backend.in
+++ b/test/rlhc.d/case/rangei_julia.jl-Y-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_julia.jl-Y-T0--var-backend.exp b/test/rlhc.d/case/rangei_julia.jl-Y-T0--var-backend.exp
index 8cfad323..8cfad323 100644
--- a/test/cases/rlhc.d/case/rangei_julia.jl-Y-T0--var-backend.exp
+++ b/test/rlhc.d/case/rangei_julia.jl-Y-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_julia.jl-Y-T0--var-backend.in b/test/rlhc.d/case/rangei_julia.jl-Y-T0--var-backend.in
index 629486ab..629486ab 100644
--- a/test/cases/rlhc.d/case/rangei_julia.jl-Y-T0--var-backend.in
+++ b/test/rlhc.d/case/rangei_julia.jl-Y-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_julia.jl-Y-T1--var-backend.exp b/test/rlhc.d/case/rangei_julia.jl-Y-T1--var-backend.exp
index 10302947..10302947 100644
--- a/test/cases/rlhc.d/case/rangei_julia.jl-Y-T1--var-backend.exp
+++ b/test/rlhc.d/case/rangei_julia.jl-Y-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_julia.jl-Y-T1--var-backend.in b/test/rlhc.d/case/rangei_julia.jl-Y-T1--var-backend.in
index 90e72e8e..90e72e8e 100644
--- a/test/cases/rlhc.d/case/rangei_julia.jl-Y-T1--var-backend.in
+++ b/test/rlhc.d/case/rangei_julia.jl-Y-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_ocaml.ml-O-F0--var-backend.exp b/test/rlhc.d/case/rangei_ocaml.ml-O-F0--var-backend.exp
index a5601f4c..a5601f4c 100644
--- a/test/cases/rlhc.d/case/rangei_ocaml.ml-O-F0--var-backend.exp
+++ b/test/rlhc.d/case/rangei_ocaml.ml-O-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_ocaml.ml-O-F0--var-backend.in b/test/rlhc.d/case/rangei_ocaml.ml-O-F0--var-backend.in
index 78c21a57..78c21a57 100644
--- a/test/cases/rlhc.d/case/rangei_ocaml.ml-O-F0--var-backend.in
+++ b/test/rlhc.d/case/rangei_ocaml.ml-O-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_ocaml.ml-O-F1--var-backend.exp b/test/rlhc.d/case/rangei_ocaml.ml-O-F1--var-backend.exp
index a5601f4c..a5601f4c 100644
--- a/test/cases/rlhc.d/case/rangei_ocaml.ml-O-F1--var-backend.exp
+++ b/test/rlhc.d/case/rangei_ocaml.ml-O-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_ocaml.ml-O-F1--var-backend.in b/test/rlhc.d/case/rangei_ocaml.ml-O-F1--var-backend.in
index 78c21a57..78c21a57 100644
--- a/test/cases/rlhc.d/case/rangei_ocaml.ml-O-F1--var-backend.in
+++ b/test/rlhc.d/case/rangei_ocaml.ml-O-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_ocaml.ml-O-T0--var-backend.exp b/test/rlhc.d/case/rangei_ocaml.ml-O-T0--var-backend.exp
index 3a898c19..3a898c19 100644
--- a/test/cases/rlhc.d/case/rangei_ocaml.ml-O-T0--var-backend.exp
+++ b/test/rlhc.d/case/rangei_ocaml.ml-O-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_ocaml.ml-O-T0--var-backend.in b/test/rlhc.d/case/rangei_ocaml.ml-O-T0--var-backend.in
index 15f4460a..15f4460a 100644
--- a/test/cases/rlhc.d/case/rangei_ocaml.ml-O-T0--var-backend.in
+++ b/test/rlhc.d/case/rangei_ocaml.ml-O-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_ocaml.ml-O-T1--var-backend.exp b/test/rlhc.d/case/rangei_ocaml.ml-O-T1--var-backend.exp
index 0f90dd8c..0f90dd8c 100644
--- a/test/cases/rlhc.d/case/rangei_ocaml.ml-O-T1--var-backend.exp
+++ b/test/rlhc.d/case/rangei_ocaml.ml-O-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_ocaml.ml-O-T1--var-backend.in b/test/rlhc.d/case/rangei_ocaml.ml-O-T1--var-backend.in
index 56bd1c7e..56bd1c7e 100644
--- a/test/cases/rlhc.d/case/rangei_ocaml.ml-O-T1--var-backend.in
+++ b/test/rlhc.d/case/rangei_ocaml.ml-O-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_ruby.rb-R-F0--var-backend.exp b/test/rlhc.d/case/rangei_ruby.rb-R-F0--var-backend.exp
index 55d769e0..55d769e0 100644
--- a/test/cases/rlhc.d/case/rangei_ruby.rb-R-F0--var-backend.exp
+++ b/test/rlhc.d/case/rangei_ruby.rb-R-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_ruby.rb-R-F0--var-backend.in b/test/rlhc.d/case/rangei_ruby.rb-R-F0--var-backend.in
index 5ed9fa5b..5ed9fa5b 100644
--- a/test/cases/rlhc.d/case/rangei_ruby.rb-R-F0--var-backend.in
+++ b/test/rlhc.d/case/rangei_ruby.rb-R-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_ruby.rb-R-F1--var-backend.exp b/test/rlhc.d/case/rangei_ruby.rb-R-F1--var-backend.exp
index 55d769e0..55d769e0 100644
--- a/test/cases/rlhc.d/case/rangei_ruby.rb-R-F1--var-backend.exp
+++ b/test/rlhc.d/case/rangei_ruby.rb-R-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_ruby.rb-R-F1--var-backend.in b/test/rlhc.d/case/rangei_ruby.rb-R-F1--var-backend.in
index 5ed9fa5b..5ed9fa5b 100644
--- a/test/cases/rlhc.d/case/rangei_ruby.rb-R-F1--var-backend.in
+++ b/test/rlhc.d/case/rangei_ruby.rb-R-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_ruby.rb-R-T0--var-backend.exp b/test/rlhc.d/case/rangei_ruby.rb-R-T0--var-backend.exp
index e7358117..e7358117 100644
--- a/test/cases/rlhc.d/case/rangei_ruby.rb-R-T0--var-backend.exp
+++ b/test/rlhc.d/case/rangei_ruby.rb-R-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_ruby.rb-R-T0--var-backend.in b/test/rlhc.d/case/rangei_ruby.rb-R-T0--var-backend.in
index 7d902ba0..7d902ba0 100644
--- a/test/cases/rlhc.d/case/rangei_ruby.rb-R-T0--var-backend.in
+++ b/test/rlhc.d/case/rangei_ruby.rb-R-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_ruby.rb-R-T1--var-backend.exp b/test/rlhc.d/case/rangei_ruby.rb-R-T1--var-backend.exp
index c7ddc954..c7ddc954 100644
--- a/test/cases/rlhc.d/case/rangei_ruby.rb-R-T1--var-backend.exp
+++ b/test/rlhc.d/case/rangei_ruby.rb-R-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_ruby.rb-R-T1--var-backend.in b/test/rlhc.d/case/rangei_ruby.rb-R-T1--var-backend.in
index 8a4e1ce7..8a4e1ce7 100644
--- a/test/cases/rlhc.d/case/rangei_ruby.rb-R-T1--var-backend.in
+++ b/test/rlhc.d/case/rangei_ruby.rb-R-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_rust.rs-U-F0--var-backend.exp b/test/rlhc.d/case/rangei_rust.rs-U-F0--var-backend.exp
index da4635a2..da4635a2 100644
--- a/test/cases/rlhc.d/case/rangei_rust.rs-U-F0--var-backend.exp
+++ b/test/rlhc.d/case/rangei_rust.rs-U-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_rust.rs-U-F0--var-backend.in b/test/rlhc.d/case/rangei_rust.rs-U-F0--var-backend.in
index 81da6e83..81da6e83 100644
--- a/test/cases/rlhc.d/case/rangei_rust.rs-U-F0--var-backend.in
+++ b/test/rlhc.d/case/rangei_rust.rs-U-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_rust.rs-U-F1--var-backend.exp b/test/rlhc.d/case/rangei_rust.rs-U-F1--var-backend.exp
index da4635a2..da4635a2 100644
--- a/test/cases/rlhc.d/case/rangei_rust.rs-U-F1--var-backend.exp
+++ b/test/rlhc.d/case/rangei_rust.rs-U-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_rust.rs-U-F1--var-backend.in b/test/rlhc.d/case/rangei_rust.rs-U-F1--var-backend.in
index 81da6e83..81da6e83 100644
--- a/test/cases/rlhc.d/case/rangei_rust.rs-U-F1--var-backend.in
+++ b/test/rlhc.d/case/rangei_rust.rs-U-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_rust.rs-U-T0--var-backend.exp b/test/rlhc.d/case/rangei_rust.rs-U-T0--var-backend.exp
index 9ece4bb3..9ece4bb3 100644
--- a/test/cases/rlhc.d/case/rangei_rust.rs-U-T0--var-backend.exp
+++ b/test/rlhc.d/case/rangei_rust.rs-U-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_rust.rs-U-T0--var-backend.in b/test/rlhc.d/case/rangei_rust.rs-U-T0--var-backend.in
index 70c98e8a..70c98e8a 100644
--- a/test/cases/rlhc.d/case/rangei_rust.rs-U-T0--var-backend.in
+++ b/test/rlhc.d/case/rangei_rust.rs-U-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/rangei_rust.rs-U-T1--var-backend.exp b/test/rlhc.d/case/rangei_rust.rs-U-T1--var-backend.exp
index 30a7a3c5..30a7a3c5 100644
--- a/test/cases/rlhc.d/case/rangei_rust.rs-U-T1--var-backend.exp
+++ b/test/rlhc.d/case/rangei_rust.rs-U-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rangei_rust.rs-U-T1--var-backend.in b/test/rlhc.d/case/rangei_rust.rs-U-T1--var-backend.in
index 8738d393..8738d393 100644
--- a/test/cases/rlhc.d/case/rangei_rust.rs-U-T1--var-backend.in
+++ b/test/rlhc.d/case/rangei_rust.rs-U-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/recdescent1.c-C-F0--goto-backend.exp b/test/rlhc.d/case/recdescent1.c-C-F0--goto-backend.exp
index fff9e699..fff9e699 100644
--- a/test/cases/rlhc.d/case/recdescent1.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/recdescent1.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/recdescent1.c-C-F0--goto-backend.in b/test/rlhc.d/case/recdescent1.c-C-F0--goto-backend.in
index 25649079..25649079 100644
--- a/test/cases/rlhc.d/case/recdescent1.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/recdescent1.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/recdescent1.c-C-F1--goto-backend.exp b/test/rlhc.d/case/recdescent1.c-C-F1--goto-backend.exp
index a25b43e0..a25b43e0 100644
--- a/test/cases/rlhc.d/case/recdescent1.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/recdescent1.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/recdescent1.c-C-F1--goto-backend.in b/test/rlhc.d/case/recdescent1.c-C-F1--goto-backend.in
index d2870e76..d2870e76 100644
--- a/test/cases/rlhc.d/case/recdescent1.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/recdescent1.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/recdescent1.c-C-G0--goto-backend.exp b/test/rlhc.d/case/recdescent1.c-C-G0--goto-backend.exp
index 32613c29..32613c29 100644
--- a/test/cases/rlhc.d/case/recdescent1.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/recdescent1.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/recdescent1.c-C-G0--goto-backend.in b/test/rlhc.d/case/recdescent1.c-C-G0--goto-backend.in
index 8506f82e..8506f82e 100644
--- a/test/cases/rlhc.d/case/recdescent1.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/recdescent1.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/recdescent1.c-C-G1--goto-backend.exp b/test/rlhc.d/case/recdescent1.c-C-G1--goto-backend.exp
index 024677fa..024677fa 100644
--- a/test/cases/rlhc.d/case/recdescent1.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/recdescent1.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/recdescent1.c-C-G1--goto-backend.in b/test/rlhc.d/case/recdescent1.c-C-G1--goto-backend.in
index 058f3d89..058f3d89 100644
--- a/test/cases/rlhc.d/case/recdescent1.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/recdescent1.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/recdescent1.c-C-G2--goto-backend.exp b/test/rlhc.d/case/recdescent1.c-C-G2--goto-backend.exp
index b79b713c..b79b713c 100644
--- a/test/cases/rlhc.d/case/recdescent1.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/recdescent1.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/recdescent1.c-C-G2--goto-backend.in b/test/rlhc.d/case/recdescent1.c-C-G2--goto-backend.in
index 67a7b224..67a7b224 100644
--- a/test/cases/rlhc.d/case/recdescent1.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/recdescent1.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/recdescent1.c-C-T0--goto-backend.exp b/test/rlhc.d/case/recdescent1.c-C-T0--goto-backend.exp
index 92ea20ee..92ea20ee 100644
--- a/test/cases/rlhc.d/case/recdescent1.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/recdescent1.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/recdescent1.c-C-T0--goto-backend.in b/test/rlhc.d/case/recdescent1.c-C-T0--goto-backend.in
index 114bab48..114bab48 100644
--- a/test/cases/rlhc.d/case/recdescent1.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/recdescent1.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/recdescent1.c-C-T1--goto-backend.exp b/test/rlhc.d/case/recdescent1.c-C-T1--goto-backend.exp
index db1ae91d..db1ae91d 100644
--- a/test/cases/rlhc.d/case/recdescent1.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/recdescent1.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/recdescent1.c-C-T1--goto-backend.in b/test/rlhc.d/case/recdescent1.c-C-T1--goto-backend.in
index 6c3c5814..6c3c5814 100644
--- a/test/cases/rlhc.d/case/recdescent1.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/recdescent1.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/recdescent2.java-J-F0--goto-backend.exp b/test/rlhc.d/case/recdescent2.java-J-F0--goto-backend.exp
index 9ffe570c..9ffe570c 100644
--- a/test/cases/rlhc.d/case/recdescent2.java-J-F0--goto-backend.exp
+++ b/test/rlhc.d/case/recdescent2.java-J-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/recdescent2.java-J-F0--goto-backend.in b/test/rlhc.d/case/recdescent2.java-J-F0--goto-backend.in
index 92728a2d..92728a2d 100644
--- a/test/cases/rlhc.d/case/recdescent2.java-J-F0--goto-backend.in
+++ b/test/rlhc.d/case/recdescent2.java-J-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/recdescent2.java-J-F1--goto-backend.exp b/test/rlhc.d/case/recdescent2.java-J-F1--goto-backend.exp
index e7de70fa..e7de70fa 100644
--- a/test/cases/rlhc.d/case/recdescent2.java-J-F1--goto-backend.exp
+++ b/test/rlhc.d/case/recdescent2.java-J-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/recdescent2.java-J-F1--goto-backend.in b/test/rlhc.d/case/recdescent2.java-J-F1--goto-backend.in
index b38d6098..b38d6098 100644
--- a/test/cases/rlhc.d/case/recdescent2.java-J-F1--goto-backend.in
+++ b/test/rlhc.d/case/recdescent2.java-J-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/recdescent2.java-J-T0--goto-backend.exp b/test/rlhc.d/case/recdescent2.java-J-T0--goto-backend.exp
index c92479e9..c92479e9 100644
--- a/test/cases/rlhc.d/case/recdescent2.java-J-T0--goto-backend.exp
+++ b/test/rlhc.d/case/recdescent2.java-J-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/recdescent2.java-J-T0--goto-backend.in b/test/rlhc.d/case/recdescent2.java-J-T0--goto-backend.in
index 3fa3af3f..3fa3af3f 100644
--- a/test/cases/rlhc.d/case/recdescent2.java-J-T0--goto-backend.in
+++ b/test/rlhc.d/case/recdescent2.java-J-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/recdescent2.java-J-T1--goto-backend.exp b/test/rlhc.d/case/recdescent2.java-J-T1--goto-backend.exp
index 31338679..31338679 100644
--- a/test/cases/rlhc.d/case/recdescent2.java-J-T1--goto-backend.exp
+++ b/test/rlhc.d/case/recdescent2.java-J-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/recdescent2.java-J-T1--goto-backend.in b/test/rlhc.d/case/recdescent2.java-J-T1--goto-backend.in
index e6a3b30f..e6a3b30f 100644
--- a/test/cases/rlhc.d/case/recdescent2.java-J-T1--goto-backend.in
+++ b/test/rlhc.d/case/recdescent2.java-J-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/recdescent4.c-C-F0--goto-backend.exp b/test/rlhc.d/case/recdescent4.c-C-F0--goto-backend.exp
index 02ef6393..02ef6393 100644
--- a/test/cases/rlhc.d/case/recdescent4.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/recdescent4.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/recdescent4.c-C-F0--goto-backend.in b/test/rlhc.d/case/recdescent4.c-C-F0--goto-backend.in
index 0c46be1e..0c46be1e 100644
--- a/test/cases/rlhc.d/case/recdescent4.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/recdescent4.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/recdescent4.c-C-F0--var-backend.exp b/test/rlhc.d/case/recdescent4.c-C-F0--var-backend.exp
index a23a6576..a23a6576 100644
--- a/test/cases/rlhc.d/case/recdescent4.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/recdescent4.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/recdescent4.c-C-F0--var-backend.in b/test/rlhc.d/case/recdescent4.c-C-F0--var-backend.in
index 81a6567e..81a6567e 100644
--- a/test/cases/rlhc.d/case/recdescent4.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/recdescent4.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/recdescent4.c-C-F1--goto-backend.exp b/test/rlhc.d/case/recdescent4.c-C-F1--goto-backend.exp
index 5c260727..5c260727 100644
--- a/test/cases/rlhc.d/case/recdescent4.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/recdescent4.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/recdescent4.c-C-F1--goto-backend.in b/test/rlhc.d/case/recdescent4.c-C-F1--goto-backend.in
index 92656d5e..92656d5e 100644
--- a/test/cases/rlhc.d/case/recdescent4.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/recdescent4.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/recdescent4.c-C-F1--var-backend.exp b/test/rlhc.d/case/recdescent4.c-C-F1--var-backend.exp
index b4c2d233..b4c2d233 100644
--- a/test/cases/rlhc.d/case/recdescent4.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/recdescent4.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/recdescent4.c-C-F1--var-backend.in b/test/rlhc.d/case/recdescent4.c-C-F1--var-backend.in
index 567d9b91..567d9b91 100644
--- a/test/cases/rlhc.d/case/recdescent4.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/recdescent4.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/recdescent4.c-C-G0--goto-backend.exp b/test/rlhc.d/case/recdescent4.c-C-G0--goto-backend.exp
index 7f47158d..7f47158d 100644
--- a/test/cases/rlhc.d/case/recdescent4.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/recdescent4.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/recdescent4.c-C-G0--goto-backend.in b/test/rlhc.d/case/recdescent4.c-C-G0--goto-backend.in
index 6f22c5ab..6f22c5ab 100644
--- a/test/cases/rlhc.d/case/recdescent4.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/recdescent4.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/recdescent4.c-C-G1--goto-backend.exp b/test/rlhc.d/case/recdescent4.c-C-G1--goto-backend.exp
index 98ad24b8..98ad24b8 100644
--- a/test/cases/rlhc.d/case/recdescent4.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/recdescent4.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/recdescent4.c-C-G1--goto-backend.in b/test/rlhc.d/case/recdescent4.c-C-G1--goto-backend.in
index 6798c7b7..6798c7b7 100644
--- a/test/cases/rlhc.d/case/recdescent4.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/recdescent4.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/recdescent4.c-C-G2--goto-backend.exp b/test/rlhc.d/case/recdescent4.c-C-G2--goto-backend.exp
index 13c2b0e5..13c2b0e5 100644
--- a/test/cases/rlhc.d/case/recdescent4.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/recdescent4.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/recdescent4.c-C-G2--goto-backend.in b/test/rlhc.d/case/recdescent4.c-C-G2--goto-backend.in
index 1d5585af..1d5585af 100644
--- a/test/cases/rlhc.d/case/recdescent4.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/recdescent4.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/recdescent4.c-C-T0--goto-backend.exp b/test/rlhc.d/case/recdescent4.c-C-T0--goto-backend.exp
index d8af806a..d8af806a 100644
--- a/test/cases/rlhc.d/case/recdescent4.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/recdescent4.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/recdescent4.c-C-T0--goto-backend.in b/test/rlhc.d/case/recdescent4.c-C-T0--goto-backend.in
index 869f37a4..869f37a4 100644
--- a/test/cases/rlhc.d/case/recdescent4.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/recdescent4.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/recdescent4.c-C-T0--var-backend.exp b/test/rlhc.d/case/recdescent4.c-C-T0--var-backend.exp
index 8c56a66a..8c56a66a 100644
--- a/test/cases/rlhc.d/case/recdescent4.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/recdescent4.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/recdescent4.c-C-T0--var-backend.in b/test/rlhc.d/case/recdescent4.c-C-T0--var-backend.in
index 512160c2..512160c2 100644
--- a/test/cases/rlhc.d/case/recdescent4.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/recdescent4.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/recdescent4.c-C-T1--goto-backend.exp b/test/rlhc.d/case/recdescent4.c-C-T1--goto-backend.exp
index aa1c4198..aa1c4198 100644
--- a/test/cases/rlhc.d/case/recdescent4.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/recdescent4.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/recdescent4.c-C-T1--goto-backend.in b/test/rlhc.d/case/recdescent4.c-C-T1--goto-backend.in
index 2382c37d..2382c37d 100644
--- a/test/cases/rlhc.d/case/recdescent4.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/recdescent4.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/recdescent4.c-C-T1--var-backend.exp b/test/rlhc.d/case/recdescent4.c-C-T1--var-backend.exp
index 193a4094..193a4094 100644
--- a/test/cases/rlhc.d/case/recdescent4.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/recdescent4.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/recdescent4.c-C-T1--var-backend.in b/test/rlhc.d/case/recdescent4.c-C-T1--var-backend.in
index 413226ec..413226ec 100644
--- a/test/cases/rlhc.d/case/recdescent4.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/recdescent4.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/recdescent5.java-J-F0--goto-backend.exp b/test/rlhc.d/case/recdescent5.java-J-F0--goto-backend.exp
index f95d5d5f..f95d5d5f 100644
--- a/test/cases/rlhc.d/case/recdescent5.java-J-F0--goto-backend.exp
+++ b/test/rlhc.d/case/recdescent5.java-J-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/recdescent5.java-J-F0--goto-backend.in b/test/rlhc.d/case/recdescent5.java-J-F0--goto-backend.in
index 05a5dfa2..05a5dfa2 100644
--- a/test/cases/rlhc.d/case/recdescent5.java-J-F0--goto-backend.in
+++ b/test/rlhc.d/case/recdescent5.java-J-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/recdescent5.java-J-F0--var-backend.exp b/test/rlhc.d/case/recdescent5.java-J-F0--var-backend.exp
index b7ba2321..b7ba2321 100644
--- a/test/cases/rlhc.d/case/recdescent5.java-J-F0--var-backend.exp
+++ b/test/rlhc.d/case/recdescent5.java-J-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/recdescent5.java-J-F0--var-backend.in b/test/rlhc.d/case/recdescent5.java-J-F0--var-backend.in
index b9b48b1e..b9b48b1e 100644
--- a/test/cases/rlhc.d/case/recdescent5.java-J-F0--var-backend.in
+++ b/test/rlhc.d/case/recdescent5.java-J-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/recdescent5.java-J-F1--goto-backend.exp b/test/rlhc.d/case/recdescent5.java-J-F1--goto-backend.exp
index 6b6adc03..6b6adc03 100644
--- a/test/cases/rlhc.d/case/recdescent5.java-J-F1--goto-backend.exp
+++ b/test/rlhc.d/case/recdescent5.java-J-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/recdescent5.java-J-F1--goto-backend.in b/test/rlhc.d/case/recdescent5.java-J-F1--goto-backend.in
index 583b0d66..583b0d66 100644
--- a/test/cases/rlhc.d/case/recdescent5.java-J-F1--goto-backend.in
+++ b/test/rlhc.d/case/recdescent5.java-J-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/recdescent5.java-J-F1--var-backend.exp b/test/rlhc.d/case/recdescent5.java-J-F1--var-backend.exp
index c2a1f80b..c2a1f80b 100644
--- a/test/cases/rlhc.d/case/recdescent5.java-J-F1--var-backend.exp
+++ b/test/rlhc.d/case/recdescent5.java-J-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/recdescent5.java-J-F1--var-backend.in b/test/rlhc.d/case/recdescent5.java-J-F1--var-backend.in
index e4867556..e4867556 100644
--- a/test/cases/rlhc.d/case/recdescent5.java-J-F1--var-backend.in
+++ b/test/rlhc.d/case/recdescent5.java-J-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/recdescent5.java-J-T0--goto-backend.exp b/test/rlhc.d/case/recdescent5.java-J-T0--goto-backend.exp
index 6eaafc49..6eaafc49 100644
--- a/test/cases/rlhc.d/case/recdescent5.java-J-T0--goto-backend.exp
+++ b/test/rlhc.d/case/recdescent5.java-J-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/recdescent5.java-J-T0--goto-backend.in b/test/rlhc.d/case/recdescent5.java-J-T0--goto-backend.in
index 069ca8cf..069ca8cf 100644
--- a/test/cases/rlhc.d/case/recdescent5.java-J-T0--goto-backend.in
+++ b/test/rlhc.d/case/recdescent5.java-J-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/recdescent5.java-J-T0--var-backend.exp b/test/rlhc.d/case/recdescent5.java-J-T0--var-backend.exp
index 829af49b..829af49b 100644
--- a/test/cases/rlhc.d/case/recdescent5.java-J-T0--var-backend.exp
+++ b/test/rlhc.d/case/recdescent5.java-J-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/recdescent5.java-J-T0--var-backend.in b/test/rlhc.d/case/recdescent5.java-J-T0--var-backend.in
index 0dcf19ec..0dcf19ec 100644
--- a/test/cases/rlhc.d/case/recdescent5.java-J-T0--var-backend.in
+++ b/test/rlhc.d/case/recdescent5.java-J-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/recdescent5.java-J-T1--goto-backend.exp b/test/rlhc.d/case/recdescent5.java-J-T1--goto-backend.exp
index 7a98989a..7a98989a 100644
--- a/test/cases/rlhc.d/case/recdescent5.java-J-T1--goto-backend.exp
+++ b/test/rlhc.d/case/recdescent5.java-J-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/recdescent5.java-J-T1--goto-backend.in b/test/rlhc.d/case/recdescent5.java-J-T1--goto-backend.in
index 2ed6fceb..2ed6fceb 100644
--- a/test/cases/rlhc.d/case/recdescent5.java-J-T1--goto-backend.in
+++ b/test/rlhc.d/case/recdescent5.java-J-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/recdescent5.java-J-T1--var-backend.exp b/test/rlhc.d/case/recdescent5.java-J-T1--var-backend.exp
index 444c40dc..444c40dc 100644
--- a/test/cases/rlhc.d/case/recdescent5.java-J-T1--var-backend.exp
+++ b/test/rlhc.d/case/recdescent5.java-J-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/recdescent5.java-J-T1--var-backend.in b/test/rlhc.d/case/recdescent5.java-J-T1--var-backend.in
index 32c1a9a2..32c1a9a2 100644
--- a/test/cases/rlhc.d/case/recdescent5.java-J-T1--var-backend.in
+++ b/test/rlhc.d/case/recdescent5.java-J-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/repetition.cpp-C-F0--goto-backend.exp b/test/rlhc.d/case/repetition.cpp-C-F0--goto-backend.exp
index 9ddc7daf..9ddc7daf 100644
--- a/test/cases/rlhc.d/case/repetition.cpp-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/repetition.cpp-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/repetition.cpp-C-F0--goto-backend.in b/test/rlhc.d/case/repetition.cpp-C-F0--goto-backend.in
index f6a17a56..f6a17a56 100644
--- a/test/cases/rlhc.d/case/repetition.cpp-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/repetition.cpp-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/repetition.cpp-C-F0--var-backend.exp b/test/rlhc.d/case/repetition.cpp-C-F0--var-backend.exp
index c3dfa930..c3dfa930 100644
--- a/test/cases/rlhc.d/case/repetition.cpp-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/repetition.cpp-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/repetition.cpp-C-F0--var-backend.in b/test/rlhc.d/case/repetition.cpp-C-F0--var-backend.in
index f00a5dca..f00a5dca 100644
--- a/test/cases/rlhc.d/case/repetition.cpp-C-F0--var-backend.in
+++ b/test/rlhc.d/case/repetition.cpp-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/repetition.cpp-C-F1--goto-backend.exp b/test/rlhc.d/case/repetition.cpp-C-F1--goto-backend.exp
index 5f9db32d..5f9db32d 100644
--- a/test/cases/rlhc.d/case/repetition.cpp-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/repetition.cpp-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/repetition.cpp-C-F1--goto-backend.in b/test/rlhc.d/case/repetition.cpp-C-F1--goto-backend.in
index 7b78b1e3..7b78b1e3 100644
--- a/test/cases/rlhc.d/case/repetition.cpp-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/repetition.cpp-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/repetition.cpp-C-F1--var-backend.exp b/test/rlhc.d/case/repetition.cpp-C-F1--var-backend.exp
index 0c6d53aa..0c6d53aa 100644
--- a/test/cases/rlhc.d/case/repetition.cpp-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/repetition.cpp-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/repetition.cpp-C-F1--var-backend.in b/test/rlhc.d/case/repetition.cpp-C-F1--var-backend.in
index c80e5e8e..c80e5e8e 100644
--- a/test/cases/rlhc.d/case/repetition.cpp-C-F1--var-backend.in
+++ b/test/rlhc.d/case/repetition.cpp-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/repetition.cpp-C-G0--goto-backend.exp b/test/rlhc.d/case/repetition.cpp-C-G0--goto-backend.exp
index 3ee135e4..3ee135e4 100644
--- a/test/cases/rlhc.d/case/repetition.cpp-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/repetition.cpp-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/repetition.cpp-C-G0--goto-backend.in b/test/rlhc.d/case/repetition.cpp-C-G0--goto-backend.in
index fe8b4e6f..fe8b4e6f 100644
--- a/test/cases/rlhc.d/case/repetition.cpp-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/repetition.cpp-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/repetition.cpp-C-G1--goto-backend.exp b/test/rlhc.d/case/repetition.cpp-C-G1--goto-backend.exp
index 3422b13f..3422b13f 100644
--- a/test/cases/rlhc.d/case/repetition.cpp-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/repetition.cpp-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/repetition.cpp-C-G1--goto-backend.in b/test/rlhc.d/case/repetition.cpp-C-G1--goto-backend.in
index 5fde3633..5fde3633 100644
--- a/test/cases/rlhc.d/case/repetition.cpp-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/repetition.cpp-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/repetition.cpp-C-G2--goto-backend.exp b/test/rlhc.d/case/repetition.cpp-C-G2--goto-backend.exp
index d5aae411..d5aae411 100644
--- a/test/cases/rlhc.d/case/repetition.cpp-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/repetition.cpp-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/repetition.cpp-C-G2--goto-backend.in b/test/rlhc.d/case/repetition.cpp-C-G2--goto-backend.in
index 27fe2eb6..27fe2eb6 100644
--- a/test/cases/rlhc.d/case/repetition.cpp-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/repetition.cpp-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/repetition.cpp-C-T0--goto-backend.exp b/test/rlhc.d/case/repetition.cpp-C-T0--goto-backend.exp
index 45ba64c6..45ba64c6 100644
--- a/test/cases/rlhc.d/case/repetition.cpp-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/repetition.cpp-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/repetition.cpp-C-T0--goto-backend.in b/test/rlhc.d/case/repetition.cpp-C-T0--goto-backend.in
index 126e7afc..126e7afc 100644
--- a/test/cases/rlhc.d/case/repetition.cpp-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/repetition.cpp-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/repetition.cpp-C-T0--var-backend.exp b/test/rlhc.d/case/repetition.cpp-C-T0--var-backend.exp
index f16b5478..f16b5478 100644
--- a/test/cases/rlhc.d/case/repetition.cpp-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/repetition.cpp-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/repetition.cpp-C-T0--var-backend.in b/test/rlhc.d/case/repetition.cpp-C-T0--var-backend.in
index 86b514be..86b514be 100644
--- a/test/cases/rlhc.d/case/repetition.cpp-C-T0--var-backend.in
+++ b/test/rlhc.d/case/repetition.cpp-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/repetition.cpp-C-T1--goto-backend.exp b/test/rlhc.d/case/repetition.cpp-C-T1--goto-backend.exp
index 97dcbb38..97dcbb38 100644
--- a/test/cases/rlhc.d/case/repetition.cpp-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/repetition.cpp-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/repetition.cpp-C-T1--goto-backend.in b/test/rlhc.d/case/repetition.cpp-C-T1--goto-backend.in
index 936615bd..936615bd 100644
--- a/test/cases/rlhc.d/case/repetition.cpp-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/repetition.cpp-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/repetition.cpp-C-T1--var-backend.exp b/test/rlhc.d/case/repetition.cpp-C-T1--var-backend.exp
index 07e3e876..07e3e876 100644
--- a/test/cases/rlhc.d/case/repetition.cpp-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/repetition.cpp-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/repetition.cpp-C-T1--var-backend.in b/test/rlhc.d/case/repetition.cpp-C-T1--var-backend.in
index dcd7dc02..dcd7dc02 100644
--- a/test/cases/rlhc.d/case/repetition.cpp-C-T1--var-backend.in
+++ b/test/rlhc.d/case/repetition.cpp-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/rlscan.cpp-C-F0--goto-backend.exp b/test/rlhc.d/case/rlscan.cpp-C-F0--goto-backend.exp
index f91a9793..f91a9793 100644
--- a/test/cases/rlhc.d/case/rlscan.cpp-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/rlscan.cpp-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/rlscan.cpp-C-F0--goto-backend.in b/test/rlhc.d/case/rlscan.cpp-C-F0--goto-backend.in
index cc27d7ff..cc27d7ff 100644
--- a/test/cases/rlhc.d/case/rlscan.cpp-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/rlscan.cpp-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/rlscan.cpp-C-F1--goto-backend.exp b/test/rlhc.d/case/rlscan.cpp-C-F1--goto-backend.exp
index 9ab6ad78..9ab6ad78 100644
--- a/test/cases/rlhc.d/case/rlscan.cpp-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/rlscan.cpp-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/rlscan.cpp-C-F1--goto-backend.in b/test/rlhc.d/case/rlscan.cpp-C-F1--goto-backend.in
index ab632a48..ab632a48 100644
--- a/test/cases/rlhc.d/case/rlscan.cpp-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/rlscan.cpp-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/rlscan.cpp-C-G0--goto-backend.exp b/test/rlhc.d/case/rlscan.cpp-C-G0--goto-backend.exp
index e9e0d894..e9e0d894 100644
--- a/test/cases/rlhc.d/case/rlscan.cpp-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/rlscan.cpp-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/rlscan.cpp-C-G0--goto-backend.in b/test/rlhc.d/case/rlscan.cpp-C-G0--goto-backend.in
index ba0d199e..ba0d199e 100644
--- a/test/cases/rlhc.d/case/rlscan.cpp-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/rlscan.cpp-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/rlscan.cpp-C-G1--goto-backend.exp b/test/rlhc.d/case/rlscan.cpp-C-G1--goto-backend.exp
index deb4ee6f..deb4ee6f 100644
--- a/test/cases/rlhc.d/case/rlscan.cpp-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/rlscan.cpp-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/rlscan.cpp-C-G1--goto-backend.in b/test/rlhc.d/case/rlscan.cpp-C-G1--goto-backend.in
index 1661fc4b..1661fc4b 100644
--- a/test/cases/rlhc.d/case/rlscan.cpp-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/rlscan.cpp-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/rlscan.cpp-C-G2--goto-backend.exp b/test/rlhc.d/case/rlscan.cpp-C-G2--goto-backend.exp
index 851b4fc6..851b4fc6 100644
--- a/test/cases/rlhc.d/case/rlscan.cpp-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/rlscan.cpp-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/rlscan.cpp-C-G2--goto-backend.in b/test/rlhc.d/case/rlscan.cpp-C-G2--goto-backend.in
index 2254ac2c..2254ac2c 100644
--- a/test/cases/rlhc.d/case/rlscan.cpp-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/rlscan.cpp-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/rlscan.cpp-C-T0--goto-backend.exp b/test/rlhc.d/case/rlscan.cpp-C-T0--goto-backend.exp
index f0a429d5..f0a429d5 100644
--- a/test/cases/rlhc.d/case/rlscan.cpp-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/rlscan.cpp-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/rlscan.cpp-C-T0--goto-backend.in b/test/rlhc.d/case/rlscan.cpp-C-T0--goto-backend.in
index c8ef0313..c8ef0313 100644
--- a/test/cases/rlhc.d/case/rlscan.cpp-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/rlscan.cpp-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/rlscan.cpp-C-T1--goto-backend.exp b/test/rlhc.d/case/rlscan.cpp-C-T1--goto-backend.exp
index fbde46dc..fbde46dc 100644
--- a/test/cases/rlhc.d/case/rlscan.cpp-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/rlscan.cpp-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/rlscan.cpp-C-T1--goto-backend.in b/test/rlhc.d/case/rlscan.cpp-C-T1--goto-backend.in
index ba62e608..ba62e608 100644
--- a/test/cases/rlhc.d/case/rlscan.cpp-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/rlscan.cpp-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/rpn1.ml-O-F0--var-backend.exp b/test/rlhc.d/case/rpn1.ml-O-F0--var-backend.exp
index fe22504c..fe22504c 100644
--- a/test/cases/rlhc.d/case/rpn1.ml-O-F0--var-backend.exp
+++ b/test/rlhc.d/case/rpn1.ml-O-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rpn1.ml-O-F0--var-backend.in b/test/rlhc.d/case/rpn1.ml-O-F0--var-backend.in
index 3f3f9b62..3f3f9b62 100644
--- a/test/cases/rlhc.d/case/rpn1.ml-O-F0--var-backend.in
+++ b/test/rlhc.d/case/rpn1.ml-O-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/rpn1.ml-O-F1--var-backend.exp b/test/rlhc.d/case/rpn1.ml-O-F1--var-backend.exp
index 4092795c..4092795c 100644
--- a/test/cases/rlhc.d/case/rpn1.ml-O-F1--var-backend.exp
+++ b/test/rlhc.d/case/rpn1.ml-O-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rpn1.ml-O-F1--var-backend.in b/test/rlhc.d/case/rpn1.ml-O-F1--var-backend.in
index 866f4711..866f4711 100644
--- a/test/cases/rlhc.d/case/rpn1.ml-O-F1--var-backend.in
+++ b/test/rlhc.d/case/rpn1.ml-O-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/rpn1.ml-O-T0--var-backend.exp b/test/rlhc.d/case/rpn1.ml-O-T0--var-backend.exp
index 4de24020..4de24020 100644
--- a/test/cases/rlhc.d/case/rpn1.ml-O-T0--var-backend.exp
+++ b/test/rlhc.d/case/rpn1.ml-O-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rpn1.ml-O-T0--var-backend.in b/test/rlhc.d/case/rpn1.ml-O-T0--var-backend.in
index 5dd15866..5dd15866 100644
--- a/test/cases/rlhc.d/case/rpn1.ml-O-T0--var-backend.in
+++ b/test/rlhc.d/case/rpn1.ml-O-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/rpn1.ml-O-T1--var-backend.exp b/test/rlhc.d/case/rpn1.ml-O-T1--var-backend.exp
index cdde7e1f..cdde7e1f 100644
--- a/test/cases/rlhc.d/case/rpn1.ml-O-T1--var-backend.exp
+++ b/test/rlhc.d/case/rpn1.ml-O-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rpn1.ml-O-T1--var-backend.in b/test/rlhc.d/case/rpn1.ml-O-T1--var-backend.in
index fcddb00e..fcddb00e 100644
--- a/test/cases/rlhc.d/case/rpn1.ml-O-T1--var-backend.in
+++ b/test/rlhc.d/case/rpn1.ml-O-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/ruby1.rb-R-F0--var-backend.exp b/test/rlhc.d/case/ruby1.rb-R-F0--var-backend.exp
index 294cc47e..294cc47e 100644
--- a/test/cases/rlhc.d/case/ruby1.rb-R-F0--var-backend.exp
+++ b/test/rlhc.d/case/ruby1.rb-R-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/ruby1.rb-R-F0--var-backend.in b/test/rlhc.d/case/ruby1.rb-R-F0--var-backend.in
index 37967e35..37967e35 100644
--- a/test/cases/rlhc.d/case/ruby1.rb-R-F0--var-backend.in
+++ b/test/rlhc.d/case/ruby1.rb-R-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/ruby1.rb-R-F1--var-backend.exp b/test/rlhc.d/case/ruby1.rb-R-F1--var-backend.exp
index b449f4d4..b449f4d4 100644
--- a/test/cases/rlhc.d/case/ruby1.rb-R-F1--var-backend.exp
+++ b/test/rlhc.d/case/ruby1.rb-R-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/ruby1.rb-R-F1--var-backend.in b/test/rlhc.d/case/ruby1.rb-R-F1--var-backend.in
index 22c3ff75..22c3ff75 100644
--- a/test/cases/rlhc.d/case/ruby1.rb-R-F1--var-backend.in
+++ b/test/rlhc.d/case/ruby1.rb-R-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/ruby1.rb-R-T0--var-backend.exp b/test/rlhc.d/case/ruby1.rb-R-T0--var-backend.exp
index 1d6b2068..1d6b2068 100644
--- a/test/cases/rlhc.d/case/ruby1.rb-R-T0--var-backend.exp
+++ b/test/rlhc.d/case/ruby1.rb-R-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/ruby1.rb-R-T0--var-backend.in b/test/rlhc.d/case/ruby1.rb-R-T0--var-backend.in
index 9820d95d..9820d95d 100644
--- a/test/cases/rlhc.d/case/ruby1.rb-R-T0--var-backend.in
+++ b/test/rlhc.d/case/ruby1.rb-R-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/ruby1.rb-R-T1--var-backend.exp b/test/rlhc.d/case/ruby1.rb-R-T1--var-backend.exp
index a4f54fb8..a4f54fb8 100644
--- a/test/cases/rlhc.d/case/ruby1.rb-R-T1--var-backend.exp
+++ b/test/rlhc.d/case/ruby1.rb-R-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/ruby1.rb-R-T1--var-backend.in b/test/rlhc.d/case/ruby1.rb-R-T1--var-backend.in
index 983a23e4..983a23e4 100644
--- a/test/cases/rlhc.d/case/ruby1.rb-R-T1--var-backend.in
+++ b/test/rlhc.d/case/ruby1.rb-R-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/rust1.rs-U-F0--var-backend.exp b/test/rlhc.d/case/rust1.rs-U-F0--var-backend.exp
index 37ce7659..37ce7659 100644
--- a/test/cases/rlhc.d/case/rust1.rs-U-F0--var-backend.exp
+++ b/test/rlhc.d/case/rust1.rs-U-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rust1.rs-U-F0--var-backend.in b/test/rlhc.d/case/rust1.rs-U-F0--var-backend.in
index 8a31434b..8a31434b 100644
--- a/test/cases/rlhc.d/case/rust1.rs-U-F0--var-backend.in
+++ b/test/rlhc.d/case/rust1.rs-U-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/rust1.rs-U-F1--var-backend.exp b/test/rlhc.d/case/rust1.rs-U-F1--var-backend.exp
index c8012404..c8012404 100644
--- a/test/cases/rlhc.d/case/rust1.rs-U-F1--var-backend.exp
+++ b/test/rlhc.d/case/rust1.rs-U-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rust1.rs-U-F1--var-backend.in b/test/rlhc.d/case/rust1.rs-U-F1--var-backend.in
index 9b449c5e..9b449c5e 100644
--- a/test/cases/rlhc.d/case/rust1.rs-U-F1--var-backend.in
+++ b/test/rlhc.d/case/rust1.rs-U-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/rust1.rs-U-T0--var-backend.exp b/test/rlhc.d/case/rust1.rs-U-T0--var-backend.exp
index 9237d1f5..9237d1f5 100644
--- a/test/cases/rlhc.d/case/rust1.rs-U-T0--var-backend.exp
+++ b/test/rlhc.d/case/rust1.rs-U-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rust1.rs-U-T0--var-backend.in b/test/rlhc.d/case/rust1.rs-U-T0--var-backend.in
index fb249039..fb249039 100644
--- a/test/cases/rlhc.d/case/rust1.rs-U-T0--var-backend.in
+++ b/test/rlhc.d/case/rust1.rs-U-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/rust1.rs-U-T1--var-backend.exp b/test/rlhc.d/case/rust1.rs-U-T1--var-backend.exp
index 9d8935d1..9d8935d1 100644
--- a/test/cases/rlhc.d/case/rust1.rs-U-T1--var-backend.exp
+++ b/test/rlhc.d/case/rust1.rs-U-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/rust1.rs-U-T1--var-backend.in b/test/rlhc.d/case/rust1.rs-U-T1--var-backend.in
index c8be59e9..c8be59e9 100644
--- a/test/cases/rlhc.d/case/rust1.rs-U-T1--var-backend.in
+++ b/test/rlhc.d/case/rust1.rs-U-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_c.c-C-F0--goto-backend.exp b/test/rlhc.d/case/scan1_c.c-C-F0--goto-backend.exp
index baeab9c5..baeab9c5 100644
--- a/test/cases/rlhc.d/case/scan1_c.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/scan1_c.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_c.c-C-F0--goto-backend.in b/test/rlhc.d/case/scan1_c.c-C-F0--goto-backend.in
index 2e0bd3f0..2e0bd3f0 100644
--- a/test/cases/rlhc.d/case/scan1_c.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/scan1_c.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_c.c-C-F0--var-backend.exp b/test/rlhc.d/case/scan1_c.c-C-F0--var-backend.exp
index 90ebff0f..90ebff0f 100644
--- a/test/cases/rlhc.d/case/scan1_c.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/scan1_c.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_c.c-C-F0--var-backend.in b/test/rlhc.d/case/scan1_c.c-C-F0--var-backend.in
index 17d0484b..17d0484b 100644
--- a/test/cases/rlhc.d/case/scan1_c.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/scan1_c.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_c.c-C-F1--goto-backend.exp b/test/rlhc.d/case/scan1_c.c-C-F1--goto-backend.exp
index d12b11e5..d12b11e5 100644
--- a/test/cases/rlhc.d/case/scan1_c.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/scan1_c.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_c.c-C-F1--goto-backend.in b/test/rlhc.d/case/scan1_c.c-C-F1--goto-backend.in
index 5119f64a..5119f64a 100644
--- a/test/cases/rlhc.d/case/scan1_c.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/scan1_c.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_c.c-C-F1--var-backend.exp b/test/rlhc.d/case/scan1_c.c-C-F1--var-backend.exp
index a952bd6e..a952bd6e 100644
--- a/test/cases/rlhc.d/case/scan1_c.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/scan1_c.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_c.c-C-F1--var-backend.in b/test/rlhc.d/case/scan1_c.c-C-F1--var-backend.in
index 67828697..67828697 100644
--- a/test/cases/rlhc.d/case/scan1_c.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/scan1_c.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_c.c-C-G0--goto-backend.exp b/test/rlhc.d/case/scan1_c.c-C-G0--goto-backend.exp
index f822531c..f822531c 100644
--- a/test/cases/rlhc.d/case/scan1_c.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/scan1_c.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_c.c-C-G0--goto-backend.in b/test/rlhc.d/case/scan1_c.c-C-G0--goto-backend.in
index d6985ceb..d6985ceb 100644
--- a/test/cases/rlhc.d/case/scan1_c.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/scan1_c.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_c.c-C-G1--goto-backend.exp b/test/rlhc.d/case/scan1_c.c-C-G1--goto-backend.exp
index 249c0387..249c0387 100644
--- a/test/cases/rlhc.d/case/scan1_c.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/scan1_c.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_c.c-C-G1--goto-backend.in b/test/rlhc.d/case/scan1_c.c-C-G1--goto-backend.in
index 1f798f28..1f798f28 100644
--- a/test/cases/rlhc.d/case/scan1_c.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/scan1_c.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_c.c-C-G2--goto-backend.exp b/test/rlhc.d/case/scan1_c.c-C-G2--goto-backend.exp
index 8fbfde1c..8fbfde1c 100644
--- a/test/cases/rlhc.d/case/scan1_c.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/scan1_c.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_c.c-C-G2--goto-backend.in b/test/rlhc.d/case/scan1_c.c-C-G2--goto-backend.in
index 65040794..65040794 100644
--- a/test/cases/rlhc.d/case/scan1_c.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/scan1_c.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_c.c-C-T0--goto-backend.exp b/test/rlhc.d/case/scan1_c.c-C-T0--goto-backend.exp
index a386709e..a386709e 100644
--- a/test/cases/rlhc.d/case/scan1_c.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/scan1_c.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_c.c-C-T0--goto-backend.in b/test/rlhc.d/case/scan1_c.c-C-T0--goto-backend.in
index a82f5eb9..a82f5eb9 100644
--- a/test/cases/rlhc.d/case/scan1_c.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/scan1_c.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_c.c-C-T0--var-backend.exp b/test/rlhc.d/case/scan1_c.c-C-T0--var-backend.exp
index 664868a8..664868a8 100644
--- a/test/cases/rlhc.d/case/scan1_c.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/scan1_c.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_c.c-C-T0--var-backend.in b/test/rlhc.d/case/scan1_c.c-C-T0--var-backend.in
index 858deff3..858deff3 100644
--- a/test/cases/rlhc.d/case/scan1_c.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/scan1_c.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_c.c-C-T1--goto-backend.exp b/test/rlhc.d/case/scan1_c.c-C-T1--goto-backend.exp
index cf26463d..cf26463d 100644
--- a/test/cases/rlhc.d/case/scan1_c.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/scan1_c.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_c.c-C-T1--goto-backend.in b/test/rlhc.d/case/scan1_c.c-C-T1--goto-backend.in
index 22d8695e..22d8695e 100644
--- a/test/cases/rlhc.d/case/scan1_c.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/scan1_c.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_c.c-C-T1--var-backend.exp b/test/rlhc.d/case/scan1_c.c-C-T1--var-backend.exp
index b6d43646..b6d43646 100644
--- a/test/cases/rlhc.d/case/scan1_c.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/scan1_c.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_c.c-C-T1--var-backend.in b/test/rlhc.d/case/scan1_c.c-C-T1--var-backend.in
index c215663d..c215663d 100644
--- a/test/cases/rlhc.d/case/scan1_c.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/scan1_c.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_crack.crk-K-F0--var-backend.exp b/test/rlhc.d/case/scan1_crack.crk-K-F0--var-backend.exp
index 88504a20..88504a20 100644
--- a/test/cases/rlhc.d/case/scan1_crack.crk-K-F0--var-backend.exp
+++ b/test/rlhc.d/case/scan1_crack.crk-K-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_crack.crk-K-F0--var-backend.in b/test/rlhc.d/case/scan1_crack.crk-K-F0--var-backend.in
index d7b580b3..d7b580b3 100644
--- a/test/cases/rlhc.d/case/scan1_crack.crk-K-F0--var-backend.in
+++ b/test/rlhc.d/case/scan1_crack.crk-K-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_crack.crk-K-F1--var-backend.exp b/test/rlhc.d/case/scan1_crack.crk-K-F1--var-backend.exp
index c8268e76..c8268e76 100644
--- a/test/cases/rlhc.d/case/scan1_crack.crk-K-F1--var-backend.exp
+++ b/test/rlhc.d/case/scan1_crack.crk-K-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_crack.crk-K-F1--var-backend.in b/test/rlhc.d/case/scan1_crack.crk-K-F1--var-backend.in
index 792474d0..792474d0 100644
--- a/test/cases/rlhc.d/case/scan1_crack.crk-K-F1--var-backend.in
+++ b/test/rlhc.d/case/scan1_crack.crk-K-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_crack.crk-K-T0--var-backend.exp b/test/rlhc.d/case/scan1_crack.crk-K-T0--var-backend.exp
index 4fd87713..4fd87713 100644
--- a/test/cases/rlhc.d/case/scan1_crack.crk-K-T0--var-backend.exp
+++ b/test/rlhc.d/case/scan1_crack.crk-K-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_crack.crk-K-T0--var-backend.in b/test/rlhc.d/case/scan1_crack.crk-K-T0--var-backend.in
index 4af2b74b..4af2b74b 100644
--- a/test/cases/rlhc.d/case/scan1_crack.crk-K-T0--var-backend.in
+++ b/test/rlhc.d/case/scan1_crack.crk-K-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_crack.crk-K-T1--var-backend.exp b/test/rlhc.d/case/scan1_crack.crk-K-T1--var-backend.exp
index 9ee2477b..9ee2477b 100644
--- a/test/cases/rlhc.d/case/scan1_crack.crk-K-T1--var-backend.exp
+++ b/test/rlhc.d/case/scan1_crack.crk-K-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_crack.crk-K-T1--var-backend.in b/test/rlhc.d/case/scan1_crack.crk-K-T1--var-backend.in
index fe7a1995..fe7a1995 100644
--- a/test/cases/rlhc.d/case/scan1_crack.crk-K-T1--var-backend.in
+++ b/test/rlhc.d/case/scan1_crack.crk-K-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_cs.cs-A-F0--goto-backend.exp b/test/rlhc.d/case/scan1_cs.cs-A-F0--goto-backend.exp
index 5a1fe6f1..5a1fe6f1 100644
--- a/test/cases/rlhc.d/case/scan1_cs.cs-A-F0--goto-backend.exp
+++ b/test/rlhc.d/case/scan1_cs.cs-A-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_cs.cs-A-F0--goto-backend.in b/test/rlhc.d/case/scan1_cs.cs-A-F0--goto-backend.in
index 884ba495..884ba495 100644
--- a/test/cases/rlhc.d/case/scan1_cs.cs-A-F0--goto-backend.in
+++ b/test/rlhc.d/case/scan1_cs.cs-A-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_cs.cs-A-F0--var-backend.exp b/test/rlhc.d/case/scan1_cs.cs-A-F0--var-backend.exp
index d497ce1b..d497ce1b 100644
--- a/test/cases/rlhc.d/case/scan1_cs.cs-A-F0--var-backend.exp
+++ b/test/rlhc.d/case/scan1_cs.cs-A-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_cs.cs-A-F0--var-backend.in b/test/rlhc.d/case/scan1_cs.cs-A-F0--var-backend.in
index ed2bcb20..ed2bcb20 100644
--- a/test/cases/rlhc.d/case/scan1_cs.cs-A-F0--var-backend.in
+++ b/test/rlhc.d/case/scan1_cs.cs-A-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_cs.cs-A-F1--goto-backend.exp b/test/rlhc.d/case/scan1_cs.cs-A-F1--goto-backend.exp
index fdd78622..fdd78622 100644
--- a/test/cases/rlhc.d/case/scan1_cs.cs-A-F1--goto-backend.exp
+++ b/test/rlhc.d/case/scan1_cs.cs-A-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_cs.cs-A-F1--goto-backend.in b/test/rlhc.d/case/scan1_cs.cs-A-F1--goto-backend.in
index 859ff120..859ff120 100644
--- a/test/cases/rlhc.d/case/scan1_cs.cs-A-F1--goto-backend.in
+++ b/test/rlhc.d/case/scan1_cs.cs-A-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_cs.cs-A-F1--var-backend.exp b/test/rlhc.d/case/scan1_cs.cs-A-F1--var-backend.exp
index dee37852..dee37852 100644
--- a/test/cases/rlhc.d/case/scan1_cs.cs-A-F1--var-backend.exp
+++ b/test/rlhc.d/case/scan1_cs.cs-A-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_cs.cs-A-F1--var-backend.in b/test/rlhc.d/case/scan1_cs.cs-A-F1--var-backend.in
index fa529376..fa529376 100644
--- a/test/cases/rlhc.d/case/scan1_cs.cs-A-F1--var-backend.in
+++ b/test/rlhc.d/case/scan1_cs.cs-A-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_cs.cs-A-G0--goto-backend.exp b/test/rlhc.d/case/scan1_cs.cs-A-G0--goto-backend.exp
index 6a9b84cc..6a9b84cc 100644
--- a/test/cases/rlhc.d/case/scan1_cs.cs-A-G0--goto-backend.exp
+++ b/test/rlhc.d/case/scan1_cs.cs-A-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_cs.cs-A-G0--goto-backend.in b/test/rlhc.d/case/scan1_cs.cs-A-G0--goto-backend.in
index 8b45a3c8..8b45a3c8 100644
--- a/test/cases/rlhc.d/case/scan1_cs.cs-A-G0--goto-backend.in
+++ b/test/rlhc.d/case/scan1_cs.cs-A-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_cs.cs-A-G1--goto-backend.exp b/test/rlhc.d/case/scan1_cs.cs-A-G1--goto-backend.exp
index 666d4a84..666d4a84 100644
--- a/test/cases/rlhc.d/case/scan1_cs.cs-A-G1--goto-backend.exp
+++ b/test/rlhc.d/case/scan1_cs.cs-A-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_cs.cs-A-G1--goto-backend.in b/test/rlhc.d/case/scan1_cs.cs-A-G1--goto-backend.in
index 19b9455a..19b9455a 100644
--- a/test/cases/rlhc.d/case/scan1_cs.cs-A-G1--goto-backend.in
+++ b/test/rlhc.d/case/scan1_cs.cs-A-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_cs.cs-A-T0--goto-backend.exp b/test/rlhc.d/case/scan1_cs.cs-A-T0--goto-backend.exp
index ec4e973a..ec4e973a 100644
--- a/test/cases/rlhc.d/case/scan1_cs.cs-A-T0--goto-backend.exp
+++ b/test/rlhc.d/case/scan1_cs.cs-A-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_cs.cs-A-T0--goto-backend.in b/test/rlhc.d/case/scan1_cs.cs-A-T0--goto-backend.in
index ed10dc37..ed10dc37 100644
--- a/test/cases/rlhc.d/case/scan1_cs.cs-A-T0--goto-backend.in
+++ b/test/rlhc.d/case/scan1_cs.cs-A-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_cs.cs-A-T0--var-backend.exp b/test/rlhc.d/case/scan1_cs.cs-A-T0--var-backend.exp
index 726260c1..726260c1 100644
--- a/test/cases/rlhc.d/case/scan1_cs.cs-A-T0--var-backend.exp
+++ b/test/rlhc.d/case/scan1_cs.cs-A-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_cs.cs-A-T0--var-backend.in b/test/rlhc.d/case/scan1_cs.cs-A-T0--var-backend.in
index dcc089b8..dcc089b8 100644
--- a/test/cases/rlhc.d/case/scan1_cs.cs-A-T0--var-backend.in
+++ b/test/rlhc.d/case/scan1_cs.cs-A-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_cs.cs-A-T1--goto-backend.exp b/test/rlhc.d/case/scan1_cs.cs-A-T1--goto-backend.exp
index ead1be9b..ead1be9b 100644
--- a/test/cases/rlhc.d/case/scan1_cs.cs-A-T1--goto-backend.exp
+++ b/test/rlhc.d/case/scan1_cs.cs-A-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_cs.cs-A-T1--goto-backend.in b/test/rlhc.d/case/scan1_cs.cs-A-T1--goto-backend.in
index 1ae78f34..1ae78f34 100644
--- a/test/cases/rlhc.d/case/scan1_cs.cs-A-T1--goto-backend.in
+++ b/test/rlhc.d/case/scan1_cs.cs-A-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_cs.cs-A-T1--var-backend.exp b/test/rlhc.d/case/scan1_cs.cs-A-T1--var-backend.exp
index 501b499d..501b499d 100644
--- a/test/cases/rlhc.d/case/scan1_cs.cs-A-T1--var-backend.exp
+++ b/test/rlhc.d/case/scan1_cs.cs-A-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_cs.cs-A-T1--var-backend.in b/test/rlhc.d/case/scan1_cs.cs-A-T1--var-backend.in
index 3a833f2e..3a833f2e 100644
--- a/test/cases/rlhc.d/case/scan1_cs.cs-A-T1--var-backend.in
+++ b/test/rlhc.d/case/scan1_cs.cs-A-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_go.go-Z-F0--goto-backend.exp b/test/rlhc.d/case/scan1_go.go-Z-F0--goto-backend.exp
index 1211d595..1211d595 100644
--- a/test/cases/rlhc.d/case/scan1_go.go-Z-F0--goto-backend.exp
+++ b/test/rlhc.d/case/scan1_go.go-Z-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_go.go-Z-F0--goto-backend.in b/test/rlhc.d/case/scan1_go.go-Z-F0--goto-backend.in
index 2149e13f..2149e13f 100644
--- a/test/cases/rlhc.d/case/scan1_go.go-Z-F0--goto-backend.in
+++ b/test/rlhc.d/case/scan1_go.go-Z-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_go.go-Z-F0--var-backend.exp b/test/rlhc.d/case/scan1_go.go-Z-F0--var-backend.exp
index 764e4d25..764e4d25 100644
--- a/test/cases/rlhc.d/case/scan1_go.go-Z-F0--var-backend.exp
+++ b/test/rlhc.d/case/scan1_go.go-Z-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_go.go-Z-F0--var-backend.in b/test/rlhc.d/case/scan1_go.go-Z-F0--var-backend.in
index 7722d67c..7722d67c 100644
--- a/test/cases/rlhc.d/case/scan1_go.go-Z-F0--var-backend.in
+++ b/test/rlhc.d/case/scan1_go.go-Z-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_go.go-Z-F1--goto-backend.exp b/test/rlhc.d/case/scan1_go.go-Z-F1--goto-backend.exp
index 052e7c43..052e7c43 100644
--- a/test/cases/rlhc.d/case/scan1_go.go-Z-F1--goto-backend.exp
+++ b/test/rlhc.d/case/scan1_go.go-Z-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_go.go-Z-F1--goto-backend.in b/test/rlhc.d/case/scan1_go.go-Z-F1--goto-backend.in
index 2f3ada16..2f3ada16 100644
--- a/test/cases/rlhc.d/case/scan1_go.go-Z-F1--goto-backend.in
+++ b/test/rlhc.d/case/scan1_go.go-Z-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_go.go-Z-F1--var-backend.exp b/test/rlhc.d/case/scan1_go.go-Z-F1--var-backend.exp
index a02624a1..a02624a1 100644
--- a/test/cases/rlhc.d/case/scan1_go.go-Z-F1--var-backend.exp
+++ b/test/rlhc.d/case/scan1_go.go-Z-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_go.go-Z-F1--var-backend.in b/test/rlhc.d/case/scan1_go.go-Z-F1--var-backend.in
index f2fea223..f2fea223 100644
--- a/test/cases/rlhc.d/case/scan1_go.go-Z-F1--var-backend.in
+++ b/test/rlhc.d/case/scan1_go.go-Z-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_go.go-Z-G0--goto-backend.exp b/test/rlhc.d/case/scan1_go.go-Z-G0--goto-backend.exp
index 7d8a546c..7d8a546c 100644
--- a/test/cases/rlhc.d/case/scan1_go.go-Z-G0--goto-backend.exp
+++ b/test/rlhc.d/case/scan1_go.go-Z-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_go.go-Z-G0--goto-backend.in b/test/rlhc.d/case/scan1_go.go-Z-G0--goto-backend.in
index 8229ac6a..8229ac6a 100644
--- a/test/cases/rlhc.d/case/scan1_go.go-Z-G0--goto-backend.in
+++ b/test/rlhc.d/case/scan1_go.go-Z-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_go.go-Z-G1--goto-backend.exp b/test/rlhc.d/case/scan1_go.go-Z-G1--goto-backend.exp
index 383a705c..383a705c 100644
--- a/test/cases/rlhc.d/case/scan1_go.go-Z-G1--goto-backend.exp
+++ b/test/rlhc.d/case/scan1_go.go-Z-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_go.go-Z-G1--goto-backend.in b/test/rlhc.d/case/scan1_go.go-Z-G1--goto-backend.in
index a65422d6..a65422d6 100644
--- a/test/cases/rlhc.d/case/scan1_go.go-Z-G1--goto-backend.in
+++ b/test/rlhc.d/case/scan1_go.go-Z-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_go.go-Z-G2--goto-backend.exp b/test/rlhc.d/case/scan1_go.go-Z-G2--goto-backend.exp
index 39a40a70..39a40a70 100644
--- a/test/cases/rlhc.d/case/scan1_go.go-Z-G2--goto-backend.exp
+++ b/test/rlhc.d/case/scan1_go.go-Z-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_go.go-Z-G2--goto-backend.in b/test/rlhc.d/case/scan1_go.go-Z-G2--goto-backend.in
index 3f6322da..3f6322da 100644
--- a/test/cases/rlhc.d/case/scan1_go.go-Z-G2--goto-backend.in
+++ b/test/rlhc.d/case/scan1_go.go-Z-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_go.go-Z-T0--goto-backend.exp b/test/rlhc.d/case/scan1_go.go-Z-T0--goto-backend.exp
index 0f047c2e..0f047c2e 100644
--- a/test/cases/rlhc.d/case/scan1_go.go-Z-T0--goto-backend.exp
+++ b/test/rlhc.d/case/scan1_go.go-Z-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_go.go-Z-T0--goto-backend.in b/test/rlhc.d/case/scan1_go.go-Z-T0--goto-backend.in
index 60159b41..60159b41 100644
--- a/test/cases/rlhc.d/case/scan1_go.go-Z-T0--goto-backend.in
+++ b/test/rlhc.d/case/scan1_go.go-Z-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_go.go-Z-T0--var-backend.exp b/test/rlhc.d/case/scan1_go.go-Z-T0--var-backend.exp
index bf2501c5..bf2501c5 100644
--- a/test/cases/rlhc.d/case/scan1_go.go-Z-T0--var-backend.exp
+++ b/test/rlhc.d/case/scan1_go.go-Z-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_go.go-Z-T0--var-backend.in b/test/rlhc.d/case/scan1_go.go-Z-T0--var-backend.in
index 949c465c..949c465c 100644
--- a/test/cases/rlhc.d/case/scan1_go.go-Z-T0--var-backend.in
+++ b/test/rlhc.d/case/scan1_go.go-Z-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_go.go-Z-T1--goto-backend.exp b/test/rlhc.d/case/scan1_go.go-Z-T1--goto-backend.exp
index 541c6539..541c6539 100644
--- a/test/cases/rlhc.d/case/scan1_go.go-Z-T1--goto-backend.exp
+++ b/test/rlhc.d/case/scan1_go.go-Z-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_go.go-Z-T1--goto-backend.in b/test/rlhc.d/case/scan1_go.go-Z-T1--goto-backend.in
index e7db4513..e7db4513 100644
--- a/test/cases/rlhc.d/case/scan1_go.go-Z-T1--goto-backend.in
+++ b/test/rlhc.d/case/scan1_go.go-Z-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_go.go-Z-T1--var-backend.exp b/test/rlhc.d/case/scan1_go.go-Z-T1--var-backend.exp
index 6365aada..6365aada 100644
--- a/test/cases/rlhc.d/case/scan1_go.go-Z-T1--var-backend.exp
+++ b/test/rlhc.d/case/scan1_go.go-Z-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_go.go-Z-T1--var-backend.in b/test/rlhc.d/case/scan1_go.go-Z-T1--var-backend.in
index 95942c73..95942c73 100644
--- a/test/cases/rlhc.d/case/scan1_go.go-Z-T1--var-backend.in
+++ b/test/rlhc.d/case/scan1_go.go-Z-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_java.java-J-F0--goto-backend.exp b/test/rlhc.d/case/scan1_java.java-J-F0--goto-backend.exp
index aa8704fe..aa8704fe 100644
--- a/test/cases/rlhc.d/case/scan1_java.java-J-F0--goto-backend.exp
+++ b/test/rlhc.d/case/scan1_java.java-J-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_java.java-J-F0--goto-backend.in b/test/rlhc.d/case/scan1_java.java-J-F0--goto-backend.in
index c322b5e0..c322b5e0 100644
--- a/test/cases/rlhc.d/case/scan1_java.java-J-F0--goto-backend.in
+++ b/test/rlhc.d/case/scan1_java.java-J-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_java.java-J-F0--var-backend.exp b/test/rlhc.d/case/scan1_java.java-J-F0--var-backend.exp
index 9c1d9aed..9c1d9aed 100644
--- a/test/cases/rlhc.d/case/scan1_java.java-J-F0--var-backend.exp
+++ b/test/rlhc.d/case/scan1_java.java-J-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_java.java-J-F0--var-backend.in b/test/rlhc.d/case/scan1_java.java-J-F0--var-backend.in
index 682ed483..682ed483 100644
--- a/test/cases/rlhc.d/case/scan1_java.java-J-F0--var-backend.in
+++ b/test/rlhc.d/case/scan1_java.java-J-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_java.java-J-F1--goto-backend.exp b/test/rlhc.d/case/scan1_java.java-J-F1--goto-backend.exp
index c7dfbdd1..c7dfbdd1 100644
--- a/test/cases/rlhc.d/case/scan1_java.java-J-F1--goto-backend.exp
+++ b/test/rlhc.d/case/scan1_java.java-J-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_java.java-J-F1--goto-backend.in b/test/rlhc.d/case/scan1_java.java-J-F1--goto-backend.in
index ce84939a..ce84939a 100644
--- a/test/cases/rlhc.d/case/scan1_java.java-J-F1--goto-backend.in
+++ b/test/rlhc.d/case/scan1_java.java-J-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_java.java-J-F1--var-backend.exp b/test/rlhc.d/case/scan1_java.java-J-F1--var-backend.exp
index c25f5bdd..c25f5bdd 100644
--- a/test/cases/rlhc.d/case/scan1_java.java-J-F1--var-backend.exp
+++ b/test/rlhc.d/case/scan1_java.java-J-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_java.java-J-F1--var-backend.in b/test/rlhc.d/case/scan1_java.java-J-F1--var-backend.in
index 2afcb048..2afcb048 100644
--- a/test/cases/rlhc.d/case/scan1_java.java-J-F1--var-backend.in
+++ b/test/rlhc.d/case/scan1_java.java-J-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_java.java-J-T0--goto-backend.exp b/test/rlhc.d/case/scan1_java.java-J-T0--goto-backend.exp
index 95970777..95970777 100644
--- a/test/cases/rlhc.d/case/scan1_java.java-J-T0--goto-backend.exp
+++ b/test/rlhc.d/case/scan1_java.java-J-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_java.java-J-T0--goto-backend.in b/test/rlhc.d/case/scan1_java.java-J-T0--goto-backend.in
index ba71496f..ba71496f 100644
--- a/test/cases/rlhc.d/case/scan1_java.java-J-T0--goto-backend.in
+++ b/test/rlhc.d/case/scan1_java.java-J-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_java.java-J-T0--var-backend.exp b/test/rlhc.d/case/scan1_java.java-J-T0--var-backend.exp
index f686dd45..f686dd45 100644
--- a/test/cases/rlhc.d/case/scan1_java.java-J-T0--var-backend.exp
+++ b/test/rlhc.d/case/scan1_java.java-J-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_java.java-J-T0--var-backend.in b/test/rlhc.d/case/scan1_java.java-J-T0--var-backend.in
index a230fe6c..a230fe6c 100644
--- a/test/cases/rlhc.d/case/scan1_java.java-J-T0--var-backend.in
+++ b/test/rlhc.d/case/scan1_java.java-J-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_java.java-J-T1--goto-backend.exp b/test/rlhc.d/case/scan1_java.java-J-T1--goto-backend.exp
index 69da9749..69da9749 100644
--- a/test/cases/rlhc.d/case/scan1_java.java-J-T1--goto-backend.exp
+++ b/test/rlhc.d/case/scan1_java.java-J-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_java.java-J-T1--goto-backend.in b/test/rlhc.d/case/scan1_java.java-J-T1--goto-backend.in
index 937bcaf3..937bcaf3 100644
--- a/test/cases/rlhc.d/case/scan1_java.java-J-T1--goto-backend.in
+++ b/test/rlhc.d/case/scan1_java.java-J-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_java.java-J-T1--var-backend.exp b/test/rlhc.d/case/scan1_java.java-J-T1--var-backend.exp
index 9156220c..9156220c 100644
--- a/test/cases/rlhc.d/case/scan1_java.java-J-T1--var-backend.exp
+++ b/test/rlhc.d/case/scan1_java.java-J-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_java.java-J-T1--var-backend.in b/test/rlhc.d/case/scan1_java.java-J-T1--var-backend.in
index 51fac04b..51fac04b 100644
--- a/test/cases/rlhc.d/case/scan1_java.java-J-T1--var-backend.in
+++ b/test/rlhc.d/case/scan1_java.java-J-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_julia.jl-Y-F0--var-backend.exp b/test/rlhc.d/case/scan1_julia.jl-Y-F0--var-backend.exp
index 05663fa9..05663fa9 100644
--- a/test/cases/rlhc.d/case/scan1_julia.jl-Y-F0--var-backend.exp
+++ b/test/rlhc.d/case/scan1_julia.jl-Y-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_julia.jl-Y-F0--var-backend.in b/test/rlhc.d/case/scan1_julia.jl-Y-F0--var-backend.in
index 488292cb..488292cb 100644
--- a/test/cases/rlhc.d/case/scan1_julia.jl-Y-F0--var-backend.in
+++ b/test/rlhc.d/case/scan1_julia.jl-Y-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_julia.jl-Y-F1--var-backend.exp b/test/rlhc.d/case/scan1_julia.jl-Y-F1--var-backend.exp
index 735d20f1..735d20f1 100644
--- a/test/cases/rlhc.d/case/scan1_julia.jl-Y-F1--var-backend.exp
+++ b/test/rlhc.d/case/scan1_julia.jl-Y-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_julia.jl-Y-F1--var-backend.in b/test/rlhc.d/case/scan1_julia.jl-Y-F1--var-backend.in
index 176bba2a..176bba2a 100644
--- a/test/cases/rlhc.d/case/scan1_julia.jl-Y-F1--var-backend.in
+++ b/test/rlhc.d/case/scan1_julia.jl-Y-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_julia.jl-Y-T0--var-backend.exp b/test/rlhc.d/case/scan1_julia.jl-Y-T0--var-backend.exp
index e531d797..e531d797 100644
--- a/test/cases/rlhc.d/case/scan1_julia.jl-Y-T0--var-backend.exp
+++ b/test/rlhc.d/case/scan1_julia.jl-Y-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_julia.jl-Y-T0--var-backend.in b/test/rlhc.d/case/scan1_julia.jl-Y-T0--var-backend.in
index 1f3ab2f0..1f3ab2f0 100644
--- a/test/cases/rlhc.d/case/scan1_julia.jl-Y-T0--var-backend.in
+++ b/test/rlhc.d/case/scan1_julia.jl-Y-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_julia.jl-Y-T1--var-backend.exp b/test/rlhc.d/case/scan1_julia.jl-Y-T1--var-backend.exp
index c5571565..c5571565 100644
--- a/test/cases/rlhc.d/case/scan1_julia.jl-Y-T1--var-backend.exp
+++ b/test/rlhc.d/case/scan1_julia.jl-Y-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_julia.jl-Y-T1--var-backend.in b/test/rlhc.d/case/scan1_julia.jl-Y-T1--var-backend.in
index 333aa947..333aa947 100644
--- a/test/cases/rlhc.d/case/scan1_julia.jl-Y-T1--var-backend.in
+++ b/test/rlhc.d/case/scan1_julia.jl-Y-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_ocaml.ml-O-F0--var-backend.exp b/test/rlhc.d/case/scan1_ocaml.ml-O-F0--var-backend.exp
index 9d4d607f..9d4d607f 100644
--- a/test/cases/rlhc.d/case/scan1_ocaml.ml-O-F0--var-backend.exp
+++ b/test/rlhc.d/case/scan1_ocaml.ml-O-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_ocaml.ml-O-F0--var-backend.in b/test/rlhc.d/case/scan1_ocaml.ml-O-F0--var-backend.in
index cc635ea2..cc635ea2 100644
--- a/test/cases/rlhc.d/case/scan1_ocaml.ml-O-F0--var-backend.in
+++ b/test/rlhc.d/case/scan1_ocaml.ml-O-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_ocaml.ml-O-F1--var-backend.exp b/test/rlhc.d/case/scan1_ocaml.ml-O-F1--var-backend.exp
index 7c002230..7c002230 100644
--- a/test/cases/rlhc.d/case/scan1_ocaml.ml-O-F1--var-backend.exp
+++ b/test/rlhc.d/case/scan1_ocaml.ml-O-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_ocaml.ml-O-F1--var-backend.in b/test/rlhc.d/case/scan1_ocaml.ml-O-F1--var-backend.in
index 754e3ae2..754e3ae2 100644
--- a/test/cases/rlhc.d/case/scan1_ocaml.ml-O-F1--var-backend.in
+++ b/test/rlhc.d/case/scan1_ocaml.ml-O-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_ocaml.ml-O-T0--var-backend.exp b/test/rlhc.d/case/scan1_ocaml.ml-O-T0--var-backend.exp
index bafa052a..bafa052a 100644
--- a/test/cases/rlhc.d/case/scan1_ocaml.ml-O-T0--var-backend.exp
+++ b/test/rlhc.d/case/scan1_ocaml.ml-O-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_ocaml.ml-O-T0--var-backend.in b/test/rlhc.d/case/scan1_ocaml.ml-O-T0--var-backend.in
index 11f2b9e7..11f2b9e7 100644
--- a/test/cases/rlhc.d/case/scan1_ocaml.ml-O-T0--var-backend.in
+++ b/test/rlhc.d/case/scan1_ocaml.ml-O-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_ocaml.ml-O-T1--var-backend.exp b/test/rlhc.d/case/scan1_ocaml.ml-O-T1--var-backend.exp
index b223f5ca..b223f5ca 100644
--- a/test/cases/rlhc.d/case/scan1_ocaml.ml-O-T1--var-backend.exp
+++ b/test/rlhc.d/case/scan1_ocaml.ml-O-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_ocaml.ml-O-T1--var-backend.in b/test/rlhc.d/case/scan1_ocaml.ml-O-T1--var-backend.in
index e38d7258..e38d7258 100644
--- a/test/cases/rlhc.d/case/scan1_ocaml.ml-O-T1--var-backend.in
+++ b/test/rlhc.d/case/scan1_ocaml.ml-O-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_ruby.rb-R-F0--var-backend.exp b/test/rlhc.d/case/scan1_ruby.rb-R-F0--var-backend.exp
index ced7d4d1..ced7d4d1 100644
--- a/test/cases/rlhc.d/case/scan1_ruby.rb-R-F0--var-backend.exp
+++ b/test/rlhc.d/case/scan1_ruby.rb-R-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_ruby.rb-R-F0--var-backend.in b/test/rlhc.d/case/scan1_ruby.rb-R-F0--var-backend.in
index e94d2850..e94d2850 100644
--- a/test/cases/rlhc.d/case/scan1_ruby.rb-R-F0--var-backend.in
+++ b/test/rlhc.d/case/scan1_ruby.rb-R-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_ruby.rb-R-F1--var-backend.exp b/test/rlhc.d/case/scan1_ruby.rb-R-F1--var-backend.exp
index 37db2d62..37db2d62 100644
--- a/test/cases/rlhc.d/case/scan1_ruby.rb-R-F1--var-backend.exp
+++ b/test/rlhc.d/case/scan1_ruby.rb-R-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_ruby.rb-R-F1--var-backend.in b/test/rlhc.d/case/scan1_ruby.rb-R-F1--var-backend.in
index c542ff1a..c542ff1a 100644
--- a/test/cases/rlhc.d/case/scan1_ruby.rb-R-F1--var-backend.in
+++ b/test/rlhc.d/case/scan1_ruby.rb-R-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_ruby.rb-R-T0--var-backend.exp b/test/rlhc.d/case/scan1_ruby.rb-R-T0--var-backend.exp
index 96f6b2c7..96f6b2c7 100644
--- a/test/cases/rlhc.d/case/scan1_ruby.rb-R-T0--var-backend.exp
+++ b/test/rlhc.d/case/scan1_ruby.rb-R-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_ruby.rb-R-T0--var-backend.in b/test/rlhc.d/case/scan1_ruby.rb-R-T0--var-backend.in
index 47f6aaf7..47f6aaf7 100644
--- a/test/cases/rlhc.d/case/scan1_ruby.rb-R-T0--var-backend.in
+++ b/test/rlhc.d/case/scan1_ruby.rb-R-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_ruby.rb-R-T1--var-backend.exp b/test/rlhc.d/case/scan1_ruby.rb-R-T1--var-backend.exp
index 8cbd69f6..8cbd69f6 100644
--- a/test/cases/rlhc.d/case/scan1_ruby.rb-R-T1--var-backend.exp
+++ b/test/rlhc.d/case/scan1_ruby.rb-R-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_ruby.rb-R-T1--var-backend.in b/test/rlhc.d/case/scan1_ruby.rb-R-T1--var-backend.in
index d2a74485..d2a74485 100644
--- a/test/cases/rlhc.d/case/scan1_ruby.rb-R-T1--var-backend.in
+++ b/test/rlhc.d/case/scan1_ruby.rb-R-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_rust.rs-U-F0--var-backend.exp b/test/rlhc.d/case/scan1_rust.rs-U-F0--var-backend.exp
index a5e8f88f..a5e8f88f 100644
--- a/test/cases/rlhc.d/case/scan1_rust.rs-U-F0--var-backend.exp
+++ b/test/rlhc.d/case/scan1_rust.rs-U-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_rust.rs-U-F0--var-backend.in b/test/rlhc.d/case/scan1_rust.rs-U-F0--var-backend.in
index 41e584c3..41e584c3 100644
--- a/test/cases/rlhc.d/case/scan1_rust.rs-U-F0--var-backend.in
+++ b/test/rlhc.d/case/scan1_rust.rs-U-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_rust.rs-U-F1--var-backend.exp b/test/rlhc.d/case/scan1_rust.rs-U-F1--var-backend.exp
index 5f71be5a..5f71be5a 100644
--- a/test/cases/rlhc.d/case/scan1_rust.rs-U-F1--var-backend.exp
+++ b/test/rlhc.d/case/scan1_rust.rs-U-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_rust.rs-U-F1--var-backend.in b/test/rlhc.d/case/scan1_rust.rs-U-F1--var-backend.in
index 78bce7ea..78bce7ea 100644
--- a/test/cases/rlhc.d/case/scan1_rust.rs-U-F1--var-backend.in
+++ b/test/rlhc.d/case/scan1_rust.rs-U-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_rust.rs-U-T0--var-backend.exp b/test/rlhc.d/case/scan1_rust.rs-U-T0--var-backend.exp
index a93feaee..a93feaee 100644
--- a/test/cases/rlhc.d/case/scan1_rust.rs-U-T0--var-backend.exp
+++ b/test/rlhc.d/case/scan1_rust.rs-U-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_rust.rs-U-T0--var-backend.in b/test/rlhc.d/case/scan1_rust.rs-U-T0--var-backend.in
index 724549ee..724549ee 100644
--- a/test/cases/rlhc.d/case/scan1_rust.rs-U-T0--var-backend.in
+++ b/test/rlhc.d/case/scan1_rust.rs-U-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan1_rust.rs-U-T1--var-backend.exp b/test/rlhc.d/case/scan1_rust.rs-U-T1--var-backend.exp
index d19bd779..d19bd779 100644
--- a/test/cases/rlhc.d/case/scan1_rust.rs-U-T1--var-backend.exp
+++ b/test/rlhc.d/case/scan1_rust.rs-U-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan1_rust.rs-U-T1--var-backend.in b/test/rlhc.d/case/scan1_rust.rs-U-T1--var-backend.in
index ae137bf3..ae137bf3 100644
--- a/test/cases/rlhc.d/case/scan1_rust.rs-U-T1--var-backend.in
+++ b/test/rlhc.d/case/scan1_rust.rs-U-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_c.c-C-F0--goto-backend.exp b/test/rlhc.d/case/scan2_c.c-C-F0--goto-backend.exp
index 2fd72d84..2fd72d84 100644
--- a/test/cases/rlhc.d/case/scan2_c.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/scan2_c.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_c.c-C-F0--goto-backend.in b/test/rlhc.d/case/scan2_c.c-C-F0--goto-backend.in
index f2e66609..f2e66609 100644
--- a/test/cases/rlhc.d/case/scan2_c.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/scan2_c.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_c.c-C-F0--var-backend.exp b/test/rlhc.d/case/scan2_c.c-C-F0--var-backend.exp
index a8d1614e..a8d1614e 100644
--- a/test/cases/rlhc.d/case/scan2_c.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/scan2_c.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_c.c-C-F0--var-backend.in b/test/rlhc.d/case/scan2_c.c-C-F0--var-backend.in
index bf789ec5..bf789ec5 100644
--- a/test/cases/rlhc.d/case/scan2_c.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/scan2_c.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_c.c-C-F1--goto-backend.exp b/test/rlhc.d/case/scan2_c.c-C-F1--goto-backend.exp
index f46fd917..f46fd917 100644
--- a/test/cases/rlhc.d/case/scan2_c.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/scan2_c.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_c.c-C-F1--goto-backend.in b/test/rlhc.d/case/scan2_c.c-C-F1--goto-backend.in
index 2394c80c..2394c80c 100644
--- a/test/cases/rlhc.d/case/scan2_c.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/scan2_c.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_c.c-C-F1--var-backend.exp b/test/rlhc.d/case/scan2_c.c-C-F1--var-backend.exp
index 7a43626a..7a43626a 100644
--- a/test/cases/rlhc.d/case/scan2_c.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/scan2_c.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_c.c-C-F1--var-backend.in b/test/rlhc.d/case/scan2_c.c-C-F1--var-backend.in
index 7928674e..7928674e 100644
--- a/test/cases/rlhc.d/case/scan2_c.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/scan2_c.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_c.c-C-G0--goto-backend.exp b/test/rlhc.d/case/scan2_c.c-C-G0--goto-backend.exp
index 92cba833..92cba833 100644
--- a/test/cases/rlhc.d/case/scan2_c.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/scan2_c.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_c.c-C-G0--goto-backend.in b/test/rlhc.d/case/scan2_c.c-C-G0--goto-backend.in
index 7615d0b7..7615d0b7 100644
--- a/test/cases/rlhc.d/case/scan2_c.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/scan2_c.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_c.c-C-G1--goto-backend.exp b/test/rlhc.d/case/scan2_c.c-C-G1--goto-backend.exp
index 4a132f2c..4a132f2c 100644
--- a/test/cases/rlhc.d/case/scan2_c.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/scan2_c.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_c.c-C-G1--goto-backend.in b/test/rlhc.d/case/scan2_c.c-C-G1--goto-backend.in
index 091f2479..091f2479 100644
--- a/test/cases/rlhc.d/case/scan2_c.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/scan2_c.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_c.c-C-G2--goto-backend.exp b/test/rlhc.d/case/scan2_c.c-C-G2--goto-backend.exp
index b374dfac..b374dfac 100644
--- a/test/cases/rlhc.d/case/scan2_c.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/scan2_c.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_c.c-C-G2--goto-backend.in b/test/rlhc.d/case/scan2_c.c-C-G2--goto-backend.in
index 9be32141..9be32141 100644
--- a/test/cases/rlhc.d/case/scan2_c.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/scan2_c.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_c.c-C-T0--goto-backend.exp b/test/rlhc.d/case/scan2_c.c-C-T0--goto-backend.exp
index c96463c6..c96463c6 100644
--- a/test/cases/rlhc.d/case/scan2_c.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/scan2_c.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_c.c-C-T0--goto-backend.in b/test/rlhc.d/case/scan2_c.c-C-T0--goto-backend.in
index 576351d4..576351d4 100644
--- a/test/cases/rlhc.d/case/scan2_c.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/scan2_c.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_c.c-C-T0--var-backend.exp b/test/rlhc.d/case/scan2_c.c-C-T0--var-backend.exp
index fa25e5fa..fa25e5fa 100644
--- a/test/cases/rlhc.d/case/scan2_c.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/scan2_c.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_c.c-C-T0--var-backend.in b/test/rlhc.d/case/scan2_c.c-C-T0--var-backend.in
index 90be3e5c..90be3e5c 100644
--- a/test/cases/rlhc.d/case/scan2_c.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/scan2_c.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_c.c-C-T1--goto-backend.exp b/test/rlhc.d/case/scan2_c.c-C-T1--goto-backend.exp
index 513b17f8..513b17f8 100644
--- a/test/cases/rlhc.d/case/scan2_c.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/scan2_c.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_c.c-C-T1--goto-backend.in b/test/rlhc.d/case/scan2_c.c-C-T1--goto-backend.in
index 39e24408..39e24408 100644
--- a/test/cases/rlhc.d/case/scan2_c.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/scan2_c.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_c.c-C-T1--var-backend.exp b/test/rlhc.d/case/scan2_c.c-C-T1--var-backend.exp
index ff7eff15..ff7eff15 100644
--- a/test/cases/rlhc.d/case/scan2_c.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/scan2_c.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_c.c-C-T1--var-backend.in b/test/rlhc.d/case/scan2_c.c-C-T1--var-backend.in
index 7e4ef93a..7e4ef93a 100644
--- a/test/cases/rlhc.d/case/scan2_c.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/scan2_c.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_crack.crk-K-F0--var-backend.exp b/test/rlhc.d/case/scan2_crack.crk-K-F0--var-backend.exp
index 0be41f0f..0be41f0f 100644
--- a/test/cases/rlhc.d/case/scan2_crack.crk-K-F0--var-backend.exp
+++ b/test/rlhc.d/case/scan2_crack.crk-K-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_crack.crk-K-F0--var-backend.in b/test/rlhc.d/case/scan2_crack.crk-K-F0--var-backend.in
index f86eadcd..f86eadcd 100644
--- a/test/cases/rlhc.d/case/scan2_crack.crk-K-F0--var-backend.in
+++ b/test/rlhc.d/case/scan2_crack.crk-K-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_crack.crk-K-F1--var-backend.exp b/test/rlhc.d/case/scan2_crack.crk-K-F1--var-backend.exp
index d2f31687..d2f31687 100644
--- a/test/cases/rlhc.d/case/scan2_crack.crk-K-F1--var-backend.exp
+++ b/test/rlhc.d/case/scan2_crack.crk-K-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_crack.crk-K-F1--var-backend.in b/test/rlhc.d/case/scan2_crack.crk-K-F1--var-backend.in
index 007a5206..007a5206 100644
--- a/test/cases/rlhc.d/case/scan2_crack.crk-K-F1--var-backend.in
+++ b/test/rlhc.d/case/scan2_crack.crk-K-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_crack.crk-K-T0--var-backend.exp b/test/rlhc.d/case/scan2_crack.crk-K-T0--var-backend.exp
index b7030585..b7030585 100644
--- a/test/cases/rlhc.d/case/scan2_crack.crk-K-T0--var-backend.exp
+++ b/test/rlhc.d/case/scan2_crack.crk-K-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_crack.crk-K-T0--var-backend.in b/test/rlhc.d/case/scan2_crack.crk-K-T0--var-backend.in
index 251c3a9e..251c3a9e 100644
--- a/test/cases/rlhc.d/case/scan2_crack.crk-K-T0--var-backend.in
+++ b/test/rlhc.d/case/scan2_crack.crk-K-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_crack.crk-K-T1--var-backend.exp b/test/rlhc.d/case/scan2_crack.crk-K-T1--var-backend.exp
index cd44beda..cd44beda 100644
--- a/test/cases/rlhc.d/case/scan2_crack.crk-K-T1--var-backend.exp
+++ b/test/rlhc.d/case/scan2_crack.crk-K-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_crack.crk-K-T1--var-backend.in b/test/rlhc.d/case/scan2_crack.crk-K-T1--var-backend.in
index 674a5477..674a5477 100644
--- a/test/cases/rlhc.d/case/scan2_crack.crk-K-T1--var-backend.in
+++ b/test/rlhc.d/case/scan2_crack.crk-K-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_cs.cs-A-F0--goto-backend.exp b/test/rlhc.d/case/scan2_cs.cs-A-F0--goto-backend.exp
index fabe76d5..fabe76d5 100644
--- a/test/cases/rlhc.d/case/scan2_cs.cs-A-F0--goto-backend.exp
+++ b/test/rlhc.d/case/scan2_cs.cs-A-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_cs.cs-A-F0--goto-backend.in b/test/rlhc.d/case/scan2_cs.cs-A-F0--goto-backend.in
index 6669ba67..6669ba67 100644
--- a/test/cases/rlhc.d/case/scan2_cs.cs-A-F0--goto-backend.in
+++ b/test/rlhc.d/case/scan2_cs.cs-A-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_cs.cs-A-F0--var-backend.exp b/test/rlhc.d/case/scan2_cs.cs-A-F0--var-backend.exp
index 68f8b645..68f8b645 100644
--- a/test/cases/rlhc.d/case/scan2_cs.cs-A-F0--var-backend.exp
+++ b/test/rlhc.d/case/scan2_cs.cs-A-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_cs.cs-A-F0--var-backend.in b/test/rlhc.d/case/scan2_cs.cs-A-F0--var-backend.in
index e730524e..e730524e 100644
--- a/test/cases/rlhc.d/case/scan2_cs.cs-A-F0--var-backend.in
+++ b/test/rlhc.d/case/scan2_cs.cs-A-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_cs.cs-A-F1--goto-backend.exp b/test/rlhc.d/case/scan2_cs.cs-A-F1--goto-backend.exp
index dbb61bd7..dbb61bd7 100644
--- a/test/cases/rlhc.d/case/scan2_cs.cs-A-F1--goto-backend.exp
+++ b/test/rlhc.d/case/scan2_cs.cs-A-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_cs.cs-A-F1--goto-backend.in b/test/rlhc.d/case/scan2_cs.cs-A-F1--goto-backend.in
index d6bc5de6..d6bc5de6 100644
--- a/test/cases/rlhc.d/case/scan2_cs.cs-A-F1--goto-backend.in
+++ b/test/rlhc.d/case/scan2_cs.cs-A-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_cs.cs-A-F1--var-backend.exp b/test/rlhc.d/case/scan2_cs.cs-A-F1--var-backend.exp
index f9ce9d73..f9ce9d73 100644
--- a/test/cases/rlhc.d/case/scan2_cs.cs-A-F1--var-backend.exp
+++ b/test/rlhc.d/case/scan2_cs.cs-A-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_cs.cs-A-F1--var-backend.in b/test/rlhc.d/case/scan2_cs.cs-A-F1--var-backend.in
index 21fd4317..21fd4317 100644
--- a/test/cases/rlhc.d/case/scan2_cs.cs-A-F1--var-backend.in
+++ b/test/rlhc.d/case/scan2_cs.cs-A-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_cs.cs-A-G0--goto-backend.exp b/test/rlhc.d/case/scan2_cs.cs-A-G0--goto-backend.exp
index 975ba894..975ba894 100644
--- a/test/cases/rlhc.d/case/scan2_cs.cs-A-G0--goto-backend.exp
+++ b/test/rlhc.d/case/scan2_cs.cs-A-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_cs.cs-A-G0--goto-backend.in b/test/rlhc.d/case/scan2_cs.cs-A-G0--goto-backend.in
index 2cd398b8..2cd398b8 100644
--- a/test/cases/rlhc.d/case/scan2_cs.cs-A-G0--goto-backend.in
+++ b/test/rlhc.d/case/scan2_cs.cs-A-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_cs.cs-A-G1--goto-backend.exp b/test/rlhc.d/case/scan2_cs.cs-A-G1--goto-backend.exp
index 6c19bff0..6c19bff0 100644
--- a/test/cases/rlhc.d/case/scan2_cs.cs-A-G1--goto-backend.exp
+++ b/test/rlhc.d/case/scan2_cs.cs-A-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_cs.cs-A-G1--goto-backend.in b/test/rlhc.d/case/scan2_cs.cs-A-G1--goto-backend.in
index e9d59071..e9d59071 100644
--- a/test/cases/rlhc.d/case/scan2_cs.cs-A-G1--goto-backend.in
+++ b/test/rlhc.d/case/scan2_cs.cs-A-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_cs.cs-A-T0--goto-backend.exp b/test/rlhc.d/case/scan2_cs.cs-A-T0--goto-backend.exp
index 3a5f7720..3a5f7720 100644
--- a/test/cases/rlhc.d/case/scan2_cs.cs-A-T0--goto-backend.exp
+++ b/test/rlhc.d/case/scan2_cs.cs-A-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_cs.cs-A-T0--goto-backend.in b/test/rlhc.d/case/scan2_cs.cs-A-T0--goto-backend.in
index 56040cd3..56040cd3 100644
--- a/test/cases/rlhc.d/case/scan2_cs.cs-A-T0--goto-backend.in
+++ b/test/rlhc.d/case/scan2_cs.cs-A-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_cs.cs-A-T0--var-backend.exp b/test/rlhc.d/case/scan2_cs.cs-A-T0--var-backend.exp
index 8ae32770..8ae32770 100644
--- a/test/cases/rlhc.d/case/scan2_cs.cs-A-T0--var-backend.exp
+++ b/test/rlhc.d/case/scan2_cs.cs-A-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_cs.cs-A-T0--var-backend.in b/test/rlhc.d/case/scan2_cs.cs-A-T0--var-backend.in
index c19dcd9b..c19dcd9b 100644
--- a/test/cases/rlhc.d/case/scan2_cs.cs-A-T0--var-backend.in
+++ b/test/rlhc.d/case/scan2_cs.cs-A-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_cs.cs-A-T1--goto-backend.exp b/test/rlhc.d/case/scan2_cs.cs-A-T1--goto-backend.exp
index 65834d57..65834d57 100644
--- a/test/cases/rlhc.d/case/scan2_cs.cs-A-T1--goto-backend.exp
+++ b/test/rlhc.d/case/scan2_cs.cs-A-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_cs.cs-A-T1--goto-backend.in b/test/rlhc.d/case/scan2_cs.cs-A-T1--goto-backend.in
index db2acbcd..db2acbcd 100644
--- a/test/cases/rlhc.d/case/scan2_cs.cs-A-T1--goto-backend.in
+++ b/test/rlhc.d/case/scan2_cs.cs-A-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_cs.cs-A-T1--var-backend.exp b/test/rlhc.d/case/scan2_cs.cs-A-T1--var-backend.exp
index 35e9403b..35e9403b 100644
--- a/test/cases/rlhc.d/case/scan2_cs.cs-A-T1--var-backend.exp
+++ b/test/rlhc.d/case/scan2_cs.cs-A-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_cs.cs-A-T1--var-backend.in b/test/rlhc.d/case/scan2_cs.cs-A-T1--var-backend.in
index f8013d95..f8013d95 100644
--- a/test/cases/rlhc.d/case/scan2_cs.cs-A-T1--var-backend.in
+++ b/test/rlhc.d/case/scan2_cs.cs-A-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_go.go-Z-F0--goto-backend.exp b/test/rlhc.d/case/scan2_go.go-Z-F0--goto-backend.exp
index f2c736ac..f2c736ac 100644
--- a/test/cases/rlhc.d/case/scan2_go.go-Z-F0--goto-backend.exp
+++ b/test/rlhc.d/case/scan2_go.go-Z-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_go.go-Z-F0--goto-backend.in b/test/rlhc.d/case/scan2_go.go-Z-F0--goto-backend.in
index 5edcd66a..5edcd66a 100644
--- a/test/cases/rlhc.d/case/scan2_go.go-Z-F0--goto-backend.in
+++ b/test/rlhc.d/case/scan2_go.go-Z-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_go.go-Z-F0--var-backend.exp b/test/rlhc.d/case/scan2_go.go-Z-F0--var-backend.exp
index 9b659991..9b659991 100644
--- a/test/cases/rlhc.d/case/scan2_go.go-Z-F0--var-backend.exp
+++ b/test/rlhc.d/case/scan2_go.go-Z-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_go.go-Z-F0--var-backend.in b/test/rlhc.d/case/scan2_go.go-Z-F0--var-backend.in
index 3b988704..3b988704 100644
--- a/test/cases/rlhc.d/case/scan2_go.go-Z-F0--var-backend.in
+++ b/test/rlhc.d/case/scan2_go.go-Z-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_go.go-Z-F1--goto-backend.exp b/test/rlhc.d/case/scan2_go.go-Z-F1--goto-backend.exp
index ff3e482a..ff3e482a 100644
--- a/test/cases/rlhc.d/case/scan2_go.go-Z-F1--goto-backend.exp
+++ b/test/rlhc.d/case/scan2_go.go-Z-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_go.go-Z-F1--goto-backend.in b/test/rlhc.d/case/scan2_go.go-Z-F1--goto-backend.in
index 265a5696..265a5696 100644
--- a/test/cases/rlhc.d/case/scan2_go.go-Z-F1--goto-backend.in
+++ b/test/rlhc.d/case/scan2_go.go-Z-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_go.go-Z-F1--var-backend.exp b/test/rlhc.d/case/scan2_go.go-Z-F1--var-backend.exp
index fef00188..fef00188 100644
--- a/test/cases/rlhc.d/case/scan2_go.go-Z-F1--var-backend.exp
+++ b/test/rlhc.d/case/scan2_go.go-Z-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_go.go-Z-F1--var-backend.in b/test/rlhc.d/case/scan2_go.go-Z-F1--var-backend.in
index e942f03a..e942f03a 100644
--- a/test/cases/rlhc.d/case/scan2_go.go-Z-F1--var-backend.in
+++ b/test/rlhc.d/case/scan2_go.go-Z-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_go.go-Z-G0--goto-backend.exp b/test/rlhc.d/case/scan2_go.go-Z-G0--goto-backend.exp
index a73b59ff..a73b59ff 100644
--- a/test/cases/rlhc.d/case/scan2_go.go-Z-G0--goto-backend.exp
+++ b/test/rlhc.d/case/scan2_go.go-Z-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_go.go-Z-G0--goto-backend.in b/test/rlhc.d/case/scan2_go.go-Z-G0--goto-backend.in
index 57c039af..57c039af 100644
--- a/test/cases/rlhc.d/case/scan2_go.go-Z-G0--goto-backend.in
+++ b/test/rlhc.d/case/scan2_go.go-Z-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_go.go-Z-G1--goto-backend.exp b/test/rlhc.d/case/scan2_go.go-Z-G1--goto-backend.exp
index a98e3826..a98e3826 100644
--- a/test/cases/rlhc.d/case/scan2_go.go-Z-G1--goto-backend.exp
+++ b/test/rlhc.d/case/scan2_go.go-Z-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_go.go-Z-G1--goto-backend.in b/test/rlhc.d/case/scan2_go.go-Z-G1--goto-backend.in
index 8ee3aacd..8ee3aacd 100644
--- a/test/cases/rlhc.d/case/scan2_go.go-Z-G1--goto-backend.in
+++ b/test/rlhc.d/case/scan2_go.go-Z-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_go.go-Z-G2--goto-backend.exp b/test/rlhc.d/case/scan2_go.go-Z-G2--goto-backend.exp
index cf59ebbb..cf59ebbb 100644
--- a/test/cases/rlhc.d/case/scan2_go.go-Z-G2--goto-backend.exp
+++ b/test/rlhc.d/case/scan2_go.go-Z-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_go.go-Z-G2--goto-backend.in b/test/rlhc.d/case/scan2_go.go-Z-G2--goto-backend.in
index 97852267..97852267 100644
--- a/test/cases/rlhc.d/case/scan2_go.go-Z-G2--goto-backend.in
+++ b/test/rlhc.d/case/scan2_go.go-Z-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_go.go-Z-T0--goto-backend.exp b/test/rlhc.d/case/scan2_go.go-Z-T0--goto-backend.exp
index 430af40c..430af40c 100644
--- a/test/cases/rlhc.d/case/scan2_go.go-Z-T0--goto-backend.exp
+++ b/test/rlhc.d/case/scan2_go.go-Z-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_go.go-Z-T0--goto-backend.in b/test/rlhc.d/case/scan2_go.go-Z-T0--goto-backend.in
index aa27798d..aa27798d 100644
--- a/test/cases/rlhc.d/case/scan2_go.go-Z-T0--goto-backend.in
+++ b/test/rlhc.d/case/scan2_go.go-Z-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_go.go-Z-T0--var-backend.exp b/test/rlhc.d/case/scan2_go.go-Z-T0--var-backend.exp
index 809cfe2c..809cfe2c 100644
--- a/test/cases/rlhc.d/case/scan2_go.go-Z-T0--var-backend.exp
+++ b/test/rlhc.d/case/scan2_go.go-Z-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_go.go-Z-T0--var-backend.in b/test/rlhc.d/case/scan2_go.go-Z-T0--var-backend.in
index 2e1d78a5..2e1d78a5 100644
--- a/test/cases/rlhc.d/case/scan2_go.go-Z-T0--var-backend.in
+++ b/test/rlhc.d/case/scan2_go.go-Z-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_go.go-Z-T1--goto-backend.exp b/test/rlhc.d/case/scan2_go.go-Z-T1--goto-backend.exp
index f53f9dd3..f53f9dd3 100644
--- a/test/cases/rlhc.d/case/scan2_go.go-Z-T1--goto-backend.exp
+++ b/test/rlhc.d/case/scan2_go.go-Z-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_go.go-Z-T1--goto-backend.in b/test/rlhc.d/case/scan2_go.go-Z-T1--goto-backend.in
index bbb6a28d..bbb6a28d 100644
--- a/test/cases/rlhc.d/case/scan2_go.go-Z-T1--goto-backend.in
+++ b/test/rlhc.d/case/scan2_go.go-Z-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_go.go-Z-T1--var-backend.exp b/test/rlhc.d/case/scan2_go.go-Z-T1--var-backend.exp
index c9517dcb..c9517dcb 100644
--- a/test/cases/rlhc.d/case/scan2_go.go-Z-T1--var-backend.exp
+++ b/test/rlhc.d/case/scan2_go.go-Z-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_go.go-Z-T1--var-backend.in b/test/rlhc.d/case/scan2_go.go-Z-T1--var-backend.in
index 541f5827..541f5827 100644
--- a/test/cases/rlhc.d/case/scan2_go.go-Z-T1--var-backend.in
+++ b/test/rlhc.d/case/scan2_go.go-Z-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_java.java-J-F0--goto-backend.exp b/test/rlhc.d/case/scan2_java.java-J-F0--goto-backend.exp
index 38dfc500..38dfc500 100644
--- a/test/cases/rlhc.d/case/scan2_java.java-J-F0--goto-backend.exp
+++ b/test/rlhc.d/case/scan2_java.java-J-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_java.java-J-F0--goto-backend.in b/test/rlhc.d/case/scan2_java.java-J-F0--goto-backend.in
index 33ccd75a..33ccd75a 100644
--- a/test/cases/rlhc.d/case/scan2_java.java-J-F0--goto-backend.in
+++ b/test/rlhc.d/case/scan2_java.java-J-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_java.java-J-F0--var-backend.exp b/test/rlhc.d/case/scan2_java.java-J-F0--var-backend.exp
index 72673ed6..72673ed6 100644
--- a/test/cases/rlhc.d/case/scan2_java.java-J-F0--var-backend.exp
+++ b/test/rlhc.d/case/scan2_java.java-J-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_java.java-J-F0--var-backend.in b/test/rlhc.d/case/scan2_java.java-J-F0--var-backend.in
index 767a9bb7..767a9bb7 100644
--- a/test/cases/rlhc.d/case/scan2_java.java-J-F0--var-backend.in
+++ b/test/rlhc.d/case/scan2_java.java-J-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_java.java-J-F1--goto-backend.exp b/test/rlhc.d/case/scan2_java.java-J-F1--goto-backend.exp
index 2386a04d..2386a04d 100644
--- a/test/cases/rlhc.d/case/scan2_java.java-J-F1--goto-backend.exp
+++ b/test/rlhc.d/case/scan2_java.java-J-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_java.java-J-F1--goto-backend.in b/test/rlhc.d/case/scan2_java.java-J-F1--goto-backend.in
index 12f01559..12f01559 100644
--- a/test/cases/rlhc.d/case/scan2_java.java-J-F1--goto-backend.in
+++ b/test/rlhc.d/case/scan2_java.java-J-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_java.java-J-F1--var-backend.exp b/test/rlhc.d/case/scan2_java.java-J-F1--var-backend.exp
index d7997db3..d7997db3 100644
--- a/test/cases/rlhc.d/case/scan2_java.java-J-F1--var-backend.exp
+++ b/test/rlhc.d/case/scan2_java.java-J-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_java.java-J-F1--var-backend.in b/test/rlhc.d/case/scan2_java.java-J-F1--var-backend.in
index e2524620..e2524620 100644
--- a/test/cases/rlhc.d/case/scan2_java.java-J-F1--var-backend.in
+++ b/test/rlhc.d/case/scan2_java.java-J-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_java.java-J-T0--goto-backend.exp b/test/rlhc.d/case/scan2_java.java-J-T0--goto-backend.exp
index 608c2097..608c2097 100644
--- a/test/cases/rlhc.d/case/scan2_java.java-J-T0--goto-backend.exp
+++ b/test/rlhc.d/case/scan2_java.java-J-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_java.java-J-T0--goto-backend.in b/test/rlhc.d/case/scan2_java.java-J-T0--goto-backend.in
index 643797e2..643797e2 100644
--- a/test/cases/rlhc.d/case/scan2_java.java-J-T0--goto-backend.in
+++ b/test/rlhc.d/case/scan2_java.java-J-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_java.java-J-T0--var-backend.exp b/test/rlhc.d/case/scan2_java.java-J-T0--var-backend.exp
index 2614bf95..2614bf95 100644
--- a/test/cases/rlhc.d/case/scan2_java.java-J-T0--var-backend.exp
+++ b/test/rlhc.d/case/scan2_java.java-J-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_java.java-J-T0--var-backend.in b/test/rlhc.d/case/scan2_java.java-J-T0--var-backend.in
index 06ea15c0..06ea15c0 100644
--- a/test/cases/rlhc.d/case/scan2_java.java-J-T0--var-backend.in
+++ b/test/rlhc.d/case/scan2_java.java-J-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_java.java-J-T1--goto-backend.exp b/test/rlhc.d/case/scan2_java.java-J-T1--goto-backend.exp
index af972687..af972687 100644
--- a/test/cases/rlhc.d/case/scan2_java.java-J-T1--goto-backend.exp
+++ b/test/rlhc.d/case/scan2_java.java-J-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_java.java-J-T1--goto-backend.in b/test/rlhc.d/case/scan2_java.java-J-T1--goto-backend.in
index 47bdee7a..47bdee7a 100644
--- a/test/cases/rlhc.d/case/scan2_java.java-J-T1--goto-backend.in
+++ b/test/rlhc.d/case/scan2_java.java-J-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_java.java-J-T1--var-backend.exp b/test/rlhc.d/case/scan2_java.java-J-T1--var-backend.exp
index 57e79c52..57e79c52 100644
--- a/test/cases/rlhc.d/case/scan2_java.java-J-T1--var-backend.exp
+++ b/test/rlhc.d/case/scan2_java.java-J-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_java.java-J-T1--var-backend.in b/test/rlhc.d/case/scan2_java.java-J-T1--var-backend.in
index 7dd9b5ea..7dd9b5ea 100644
--- a/test/cases/rlhc.d/case/scan2_java.java-J-T1--var-backend.in
+++ b/test/rlhc.d/case/scan2_java.java-J-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_julia.jl-Y-F0--var-backend.exp b/test/rlhc.d/case/scan2_julia.jl-Y-F0--var-backend.exp
index d4453858..d4453858 100644
--- a/test/cases/rlhc.d/case/scan2_julia.jl-Y-F0--var-backend.exp
+++ b/test/rlhc.d/case/scan2_julia.jl-Y-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_julia.jl-Y-F0--var-backend.in b/test/rlhc.d/case/scan2_julia.jl-Y-F0--var-backend.in
index 5a6eebb5..5a6eebb5 100644
--- a/test/cases/rlhc.d/case/scan2_julia.jl-Y-F0--var-backend.in
+++ b/test/rlhc.d/case/scan2_julia.jl-Y-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_julia.jl-Y-F1--var-backend.exp b/test/rlhc.d/case/scan2_julia.jl-Y-F1--var-backend.exp
index cd46930c..cd46930c 100644
--- a/test/cases/rlhc.d/case/scan2_julia.jl-Y-F1--var-backend.exp
+++ b/test/rlhc.d/case/scan2_julia.jl-Y-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_julia.jl-Y-F1--var-backend.in b/test/rlhc.d/case/scan2_julia.jl-Y-F1--var-backend.in
index 4697a802..4697a802 100644
--- a/test/cases/rlhc.d/case/scan2_julia.jl-Y-F1--var-backend.in
+++ b/test/rlhc.d/case/scan2_julia.jl-Y-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_julia.jl-Y-T0--var-backend.exp b/test/rlhc.d/case/scan2_julia.jl-Y-T0--var-backend.exp
index 2ca5ddfd..2ca5ddfd 100644
--- a/test/cases/rlhc.d/case/scan2_julia.jl-Y-T0--var-backend.exp
+++ b/test/rlhc.d/case/scan2_julia.jl-Y-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_julia.jl-Y-T0--var-backend.in b/test/rlhc.d/case/scan2_julia.jl-Y-T0--var-backend.in
index 6d0a7884..6d0a7884 100644
--- a/test/cases/rlhc.d/case/scan2_julia.jl-Y-T0--var-backend.in
+++ b/test/rlhc.d/case/scan2_julia.jl-Y-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_julia.jl-Y-T1--var-backend.exp b/test/rlhc.d/case/scan2_julia.jl-Y-T1--var-backend.exp
index 5e383298..5e383298 100644
--- a/test/cases/rlhc.d/case/scan2_julia.jl-Y-T1--var-backend.exp
+++ b/test/rlhc.d/case/scan2_julia.jl-Y-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_julia.jl-Y-T1--var-backend.in b/test/rlhc.d/case/scan2_julia.jl-Y-T1--var-backend.in
index d368a5e7..d368a5e7 100644
--- a/test/cases/rlhc.d/case/scan2_julia.jl-Y-T1--var-backend.in
+++ b/test/rlhc.d/case/scan2_julia.jl-Y-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_ocaml.ml-O-F0--var-backend.exp b/test/rlhc.d/case/scan2_ocaml.ml-O-F0--var-backend.exp
index 344fea18..344fea18 100644
--- a/test/cases/rlhc.d/case/scan2_ocaml.ml-O-F0--var-backend.exp
+++ b/test/rlhc.d/case/scan2_ocaml.ml-O-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_ocaml.ml-O-F0--var-backend.in b/test/rlhc.d/case/scan2_ocaml.ml-O-F0--var-backend.in
index 56230bbb..56230bbb 100644
--- a/test/cases/rlhc.d/case/scan2_ocaml.ml-O-F0--var-backend.in
+++ b/test/rlhc.d/case/scan2_ocaml.ml-O-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_ocaml.ml-O-F1--var-backend.exp b/test/rlhc.d/case/scan2_ocaml.ml-O-F1--var-backend.exp
index 08bf5577..08bf5577 100644
--- a/test/cases/rlhc.d/case/scan2_ocaml.ml-O-F1--var-backend.exp
+++ b/test/rlhc.d/case/scan2_ocaml.ml-O-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_ocaml.ml-O-F1--var-backend.in b/test/rlhc.d/case/scan2_ocaml.ml-O-F1--var-backend.in
index cba8b8ef..cba8b8ef 100644
--- a/test/cases/rlhc.d/case/scan2_ocaml.ml-O-F1--var-backend.in
+++ b/test/rlhc.d/case/scan2_ocaml.ml-O-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_ocaml.ml-O-T0--var-backend.exp b/test/rlhc.d/case/scan2_ocaml.ml-O-T0--var-backend.exp
index ec5c59c3..ec5c59c3 100644
--- a/test/cases/rlhc.d/case/scan2_ocaml.ml-O-T0--var-backend.exp
+++ b/test/rlhc.d/case/scan2_ocaml.ml-O-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_ocaml.ml-O-T0--var-backend.in b/test/rlhc.d/case/scan2_ocaml.ml-O-T0--var-backend.in
index f02d6aee..f02d6aee 100644
--- a/test/cases/rlhc.d/case/scan2_ocaml.ml-O-T0--var-backend.in
+++ b/test/rlhc.d/case/scan2_ocaml.ml-O-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_ocaml.ml-O-T1--var-backend.exp b/test/rlhc.d/case/scan2_ocaml.ml-O-T1--var-backend.exp
index e53641bb..e53641bb 100644
--- a/test/cases/rlhc.d/case/scan2_ocaml.ml-O-T1--var-backend.exp
+++ b/test/rlhc.d/case/scan2_ocaml.ml-O-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_ocaml.ml-O-T1--var-backend.in b/test/rlhc.d/case/scan2_ocaml.ml-O-T1--var-backend.in
index 20300af6..20300af6 100644
--- a/test/cases/rlhc.d/case/scan2_ocaml.ml-O-T1--var-backend.in
+++ b/test/rlhc.d/case/scan2_ocaml.ml-O-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_ruby.rb-R-F0--var-backend.exp b/test/rlhc.d/case/scan2_ruby.rb-R-F0--var-backend.exp
index b60f09d6..b60f09d6 100644
--- a/test/cases/rlhc.d/case/scan2_ruby.rb-R-F0--var-backend.exp
+++ b/test/rlhc.d/case/scan2_ruby.rb-R-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_ruby.rb-R-F0--var-backend.in b/test/rlhc.d/case/scan2_ruby.rb-R-F0--var-backend.in
index f781e31a..f781e31a 100644
--- a/test/cases/rlhc.d/case/scan2_ruby.rb-R-F0--var-backend.in
+++ b/test/rlhc.d/case/scan2_ruby.rb-R-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_ruby.rb-R-F1--var-backend.exp b/test/rlhc.d/case/scan2_ruby.rb-R-F1--var-backend.exp
index 5f0ca965..5f0ca965 100644
--- a/test/cases/rlhc.d/case/scan2_ruby.rb-R-F1--var-backend.exp
+++ b/test/rlhc.d/case/scan2_ruby.rb-R-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_ruby.rb-R-F1--var-backend.in b/test/rlhc.d/case/scan2_ruby.rb-R-F1--var-backend.in
index e6e1ede1..e6e1ede1 100644
--- a/test/cases/rlhc.d/case/scan2_ruby.rb-R-F1--var-backend.in
+++ b/test/rlhc.d/case/scan2_ruby.rb-R-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_ruby.rb-R-T0--var-backend.exp b/test/rlhc.d/case/scan2_ruby.rb-R-T0--var-backend.exp
index d062c48a..d062c48a 100644
--- a/test/cases/rlhc.d/case/scan2_ruby.rb-R-T0--var-backend.exp
+++ b/test/rlhc.d/case/scan2_ruby.rb-R-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_ruby.rb-R-T0--var-backend.in b/test/rlhc.d/case/scan2_ruby.rb-R-T0--var-backend.in
index c0baeb5e..c0baeb5e 100644
--- a/test/cases/rlhc.d/case/scan2_ruby.rb-R-T0--var-backend.in
+++ b/test/rlhc.d/case/scan2_ruby.rb-R-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_ruby.rb-R-T1--var-backend.exp b/test/rlhc.d/case/scan2_ruby.rb-R-T1--var-backend.exp
index 258e88df..258e88df 100644
--- a/test/cases/rlhc.d/case/scan2_ruby.rb-R-T1--var-backend.exp
+++ b/test/rlhc.d/case/scan2_ruby.rb-R-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_ruby.rb-R-T1--var-backend.in b/test/rlhc.d/case/scan2_ruby.rb-R-T1--var-backend.in
index b2c5b685..b2c5b685 100644
--- a/test/cases/rlhc.d/case/scan2_ruby.rb-R-T1--var-backend.in
+++ b/test/rlhc.d/case/scan2_ruby.rb-R-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_rust.rs-U-F0--var-backend.exp b/test/rlhc.d/case/scan2_rust.rs-U-F0--var-backend.exp
index cb539cc3..cb539cc3 100644
--- a/test/cases/rlhc.d/case/scan2_rust.rs-U-F0--var-backend.exp
+++ b/test/rlhc.d/case/scan2_rust.rs-U-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_rust.rs-U-F0--var-backend.in b/test/rlhc.d/case/scan2_rust.rs-U-F0--var-backend.in
index 281f07d9..281f07d9 100644
--- a/test/cases/rlhc.d/case/scan2_rust.rs-U-F0--var-backend.in
+++ b/test/rlhc.d/case/scan2_rust.rs-U-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_rust.rs-U-F1--var-backend.exp b/test/rlhc.d/case/scan2_rust.rs-U-F1--var-backend.exp
index 33465a72..33465a72 100644
--- a/test/cases/rlhc.d/case/scan2_rust.rs-U-F1--var-backend.exp
+++ b/test/rlhc.d/case/scan2_rust.rs-U-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_rust.rs-U-F1--var-backend.in b/test/rlhc.d/case/scan2_rust.rs-U-F1--var-backend.in
index e451425a..e451425a 100644
--- a/test/cases/rlhc.d/case/scan2_rust.rs-U-F1--var-backend.in
+++ b/test/rlhc.d/case/scan2_rust.rs-U-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_rust.rs-U-T0--var-backend.exp b/test/rlhc.d/case/scan2_rust.rs-U-T0--var-backend.exp
index a1b1f0eb..a1b1f0eb 100644
--- a/test/cases/rlhc.d/case/scan2_rust.rs-U-T0--var-backend.exp
+++ b/test/rlhc.d/case/scan2_rust.rs-U-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_rust.rs-U-T0--var-backend.in b/test/rlhc.d/case/scan2_rust.rs-U-T0--var-backend.in
index 08ffe703..08ffe703 100644
--- a/test/cases/rlhc.d/case/scan2_rust.rs-U-T0--var-backend.in
+++ b/test/rlhc.d/case/scan2_rust.rs-U-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan2_rust.rs-U-T1--var-backend.exp b/test/rlhc.d/case/scan2_rust.rs-U-T1--var-backend.exp
index 665e21f5..665e21f5 100644
--- a/test/cases/rlhc.d/case/scan2_rust.rs-U-T1--var-backend.exp
+++ b/test/rlhc.d/case/scan2_rust.rs-U-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan2_rust.rs-U-T1--var-backend.in b/test/rlhc.d/case/scan2_rust.rs-U-T1--var-backend.in
index 755155c6..755155c6 100644
--- a/test/cases/rlhc.d/case/scan2_rust.rs-U-T1--var-backend.in
+++ b/test/rlhc.d/case/scan2_rust.rs-U-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_c.c-C-F0--goto-backend.exp b/test/rlhc.d/case/scan3_c.c-C-F0--goto-backend.exp
index fe48e1e6..fe48e1e6 100644
--- a/test/cases/rlhc.d/case/scan3_c.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/scan3_c.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_c.c-C-F0--goto-backend.in b/test/rlhc.d/case/scan3_c.c-C-F0--goto-backend.in
index bf1e77af..bf1e77af 100644
--- a/test/cases/rlhc.d/case/scan3_c.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/scan3_c.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_c.c-C-F0--var-backend.exp b/test/rlhc.d/case/scan3_c.c-C-F0--var-backend.exp
index 3f7839d5..3f7839d5 100644
--- a/test/cases/rlhc.d/case/scan3_c.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/scan3_c.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_c.c-C-F0--var-backend.in b/test/rlhc.d/case/scan3_c.c-C-F0--var-backend.in
index 222af1d5..222af1d5 100644
--- a/test/cases/rlhc.d/case/scan3_c.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/scan3_c.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_c.c-C-F1--goto-backend.exp b/test/rlhc.d/case/scan3_c.c-C-F1--goto-backend.exp
index 77fdec37..77fdec37 100644
--- a/test/cases/rlhc.d/case/scan3_c.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/scan3_c.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_c.c-C-F1--goto-backend.in b/test/rlhc.d/case/scan3_c.c-C-F1--goto-backend.in
index f5c4a381..f5c4a381 100644
--- a/test/cases/rlhc.d/case/scan3_c.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/scan3_c.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_c.c-C-F1--var-backend.exp b/test/rlhc.d/case/scan3_c.c-C-F1--var-backend.exp
index c462ce35..c462ce35 100644
--- a/test/cases/rlhc.d/case/scan3_c.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/scan3_c.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_c.c-C-F1--var-backend.in b/test/rlhc.d/case/scan3_c.c-C-F1--var-backend.in
index c210dd1c..c210dd1c 100644
--- a/test/cases/rlhc.d/case/scan3_c.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/scan3_c.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_c.c-C-G0--goto-backend.exp b/test/rlhc.d/case/scan3_c.c-C-G0--goto-backend.exp
index a0fee9d6..a0fee9d6 100644
--- a/test/cases/rlhc.d/case/scan3_c.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/scan3_c.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_c.c-C-G0--goto-backend.in b/test/rlhc.d/case/scan3_c.c-C-G0--goto-backend.in
index 930e1b52..930e1b52 100644
--- a/test/cases/rlhc.d/case/scan3_c.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/scan3_c.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_c.c-C-G1--goto-backend.exp b/test/rlhc.d/case/scan3_c.c-C-G1--goto-backend.exp
index 689326de..689326de 100644
--- a/test/cases/rlhc.d/case/scan3_c.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/scan3_c.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_c.c-C-G1--goto-backend.in b/test/rlhc.d/case/scan3_c.c-C-G1--goto-backend.in
index e8d23f80..e8d23f80 100644
--- a/test/cases/rlhc.d/case/scan3_c.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/scan3_c.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_c.c-C-G2--goto-backend.exp b/test/rlhc.d/case/scan3_c.c-C-G2--goto-backend.exp
index de0e9f62..de0e9f62 100644
--- a/test/cases/rlhc.d/case/scan3_c.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/scan3_c.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_c.c-C-G2--goto-backend.in b/test/rlhc.d/case/scan3_c.c-C-G2--goto-backend.in
index d9dfd195..d9dfd195 100644
--- a/test/cases/rlhc.d/case/scan3_c.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/scan3_c.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_c.c-C-T0--goto-backend.exp b/test/rlhc.d/case/scan3_c.c-C-T0--goto-backend.exp
index 9d013ea8..9d013ea8 100644
--- a/test/cases/rlhc.d/case/scan3_c.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/scan3_c.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_c.c-C-T0--goto-backend.in b/test/rlhc.d/case/scan3_c.c-C-T0--goto-backend.in
index 451bfc6a..451bfc6a 100644
--- a/test/cases/rlhc.d/case/scan3_c.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/scan3_c.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_c.c-C-T0--var-backend.exp b/test/rlhc.d/case/scan3_c.c-C-T0--var-backend.exp
index 6bb8d82a..6bb8d82a 100644
--- a/test/cases/rlhc.d/case/scan3_c.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/scan3_c.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_c.c-C-T0--var-backend.in b/test/rlhc.d/case/scan3_c.c-C-T0--var-backend.in
index 4fe46e12..4fe46e12 100644
--- a/test/cases/rlhc.d/case/scan3_c.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/scan3_c.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_c.c-C-T1--goto-backend.exp b/test/rlhc.d/case/scan3_c.c-C-T1--goto-backend.exp
index beb65118..beb65118 100644
--- a/test/cases/rlhc.d/case/scan3_c.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/scan3_c.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_c.c-C-T1--goto-backend.in b/test/rlhc.d/case/scan3_c.c-C-T1--goto-backend.in
index 11a70fb1..11a70fb1 100644
--- a/test/cases/rlhc.d/case/scan3_c.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/scan3_c.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_c.c-C-T1--var-backend.exp b/test/rlhc.d/case/scan3_c.c-C-T1--var-backend.exp
index f7b81c91..f7b81c91 100644
--- a/test/cases/rlhc.d/case/scan3_c.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/scan3_c.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_c.c-C-T1--var-backend.in b/test/rlhc.d/case/scan3_c.c-C-T1--var-backend.in
index 5497f6e9..5497f6e9 100644
--- a/test/cases/rlhc.d/case/scan3_c.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/scan3_c.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_crack.crk-K-F0--var-backend.exp b/test/rlhc.d/case/scan3_crack.crk-K-F0--var-backend.exp
index 94c6d60a..94c6d60a 100644
--- a/test/cases/rlhc.d/case/scan3_crack.crk-K-F0--var-backend.exp
+++ b/test/rlhc.d/case/scan3_crack.crk-K-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_crack.crk-K-F0--var-backend.in b/test/rlhc.d/case/scan3_crack.crk-K-F0--var-backend.in
index dd9dbb2b..dd9dbb2b 100644
--- a/test/cases/rlhc.d/case/scan3_crack.crk-K-F0--var-backend.in
+++ b/test/rlhc.d/case/scan3_crack.crk-K-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_crack.crk-K-F1--var-backend.exp b/test/rlhc.d/case/scan3_crack.crk-K-F1--var-backend.exp
index 26cc73b3..26cc73b3 100644
--- a/test/cases/rlhc.d/case/scan3_crack.crk-K-F1--var-backend.exp
+++ b/test/rlhc.d/case/scan3_crack.crk-K-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_crack.crk-K-F1--var-backend.in b/test/rlhc.d/case/scan3_crack.crk-K-F1--var-backend.in
index 7b670218..7b670218 100644
--- a/test/cases/rlhc.d/case/scan3_crack.crk-K-F1--var-backend.in
+++ b/test/rlhc.d/case/scan3_crack.crk-K-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_crack.crk-K-T0--var-backend.exp b/test/rlhc.d/case/scan3_crack.crk-K-T0--var-backend.exp
index 06dbb146..06dbb146 100644
--- a/test/cases/rlhc.d/case/scan3_crack.crk-K-T0--var-backend.exp
+++ b/test/rlhc.d/case/scan3_crack.crk-K-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_crack.crk-K-T0--var-backend.in b/test/rlhc.d/case/scan3_crack.crk-K-T0--var-backend.in
index 134436e2..134436e2 100644
--- a/test/cases/rlhc.d/case/scan3_crack.crk-K-T0--var-backend.in
+++ b/test/rlhc.d/case/scan3_crack.crk-K-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_crack.crk-K-T1--var-backend.exp b/test/rlhc.d/case/scan3_crack.crk-K-T1--var-backend.exp
index e1d3165c..e1d3165c 100644
--- a/test/cases/rlhc.d/case/scan3_crack.crk-K-T1--var-backend.exp
+++ b/test/rlhc.d/case/scan3_crack.crk-K-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_crack.crk-K-T1--var-backend.in b/test/rlhc.d/case/scan3_crack.crk-K-T1--var-backend.in
index fca7dd30..fca7dd30 100644
--- a/test/cases/rlhc.d/case/scan3_crack.crk-K-T1--var-backend.in
+++ b/test/rlhc.d/case/scan3_crack.crk-K-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_cs.cs-A-F0--goto-backend.exp b/test/rlhc.d/case/scan3_cs.cs-A-F0--goto-backend.exp
index eda543c3..eda543c3 100644
--- a/test/cases/rlhc.d/case/scan3_cs.cs-A-F0--goto-backend.exp
+++ b/test/rlhc.d/case/scan3_cs.cs-A-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_cs.cs-A-F0--goto-backend.in b/test/rlhc.d/case/scan3_cs.cs-A-F0--goto-backend.in
index 6e2c9ab7..6e2c9ab7 100644
--- a/test/cases/rlhc.d/case/scan3_cs.cs-A-F0--goto-backend.in
+++ b/test/rlhc.d/case/scan3_cs.cs-A-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_cs.cs-A-F0--var-backend.exp b/test/rlhc.d/case/scan3_cs.cs-A-F0--var-backend.exp
index 0245d127..0245d127 100644
--- a/test/cases/rlhc.d/case/scan3_cs.cs-A-F0--var-backend.exp
+++ b/test/rlhc.d/case/scan3_cs.cs-A-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_cs.cs-A-F0--var-backend.in b/test/rlhc.d/case/scan3_cs.cs-A-F0--var-backend.in
index c299b164..c299b164 100644
--- a/test/cases/rlhc.d/case/scan3_cs.cs-A-F0--var-backend.in
+++ b/test/rlhc.d/case/scan3_cs.cs-A-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_cs.cs-A-F1--goto-backend.exp b/test/rlhc.d/case/scan3_cs.cs-A-F1--goto-backend.exp
index 3f69d113..3f69d113 100644
--- a/test/cases/rlhc.d/case/scan3_cs.cs-A-F1--goto-backend.exp
+++ b/test/rlhc.d/case/scan3_cs.cs-A-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_cs.cs-A-F1--goto-backend.in b/test/rlhc.d/case/scan3_cs.cs-A-F1--goto-backend.in
index a6772707..a6772707 100644
--- a/test/cases/rlhc.d/case/scan3_cs.cs-A-F1--goto-backend.in
+++ b/test/rlhc.d/case/scan3_cs.cs-A-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_cs.cs-A-F1--var-backend.exp b/test/rlhc.d/case/scan3_cs.cs-A-F1--var-backend.exp
index e0147afe..e0147afe 100644
--- a/test/cases/rlhc.d/case/scan3_cs.cs-A-F1--var-backend.exp
+++ b/test/rlhc.d/case/scan3_cs.cs-A-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_cs.cs-A-F1--var-backend.in b/test/rlhc.d/case/scan3_cs.cs-A-F1--var-backend.in
index e38694ac..e38694ac 100644
--- a/test/cases/rlhc.d/case/scan3_cs.cs-A-F1--var-backend.in
+++ b/test/rlhc.d/case/scan3_cs.cs-A-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_cs.cs-A-G0--goto-backend.exp b/test/rlhc.d/case/scan3_cs.cs-A-G0--goto-backend.exp
index 8cb2ac4a..8cb2ac4a 100644
--- a/test/cases/rlhc.d/case/scan3_cs.cs-A-G0--goto-backend.exp
+++ b/test/rlhc.d/case/scan3_cs.cs-A-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_cs.cs-A-G0--goto-backend.in b/test/rlhc.d/case/scan3_cs.cs-A-G0--goto-backend.in
index e92332bb..e92332bb 100644
--- a/test/cases/rlhc.d/case/scan3_cs.cs-A-G0--goto-backend.in
+++ b/test/rlhc.d/case/scan3_cs.cs-A-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_cs.cs-A-G1--goto-backend.exp b/test/rlhc.d/case/scan3_cs.cs-A-G1--goto-backend.exp
index 26cecb23..26cecb23 100644
--- a/test/cases/rlhc.d/case/scan3_cs.cs-A-G1--goto-backend.exp
+++ b/test/rlhc.d/case/scan3_cs.cs-A-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_cs.cs-A-G1--goto-backend.in b/test/rlhc.d/case/scan3_cs.cs-A-G1--goto-backend.in
index e77c3eec..e77c3eec 100644
--- a/test/cases/rlhc.d/case/scan3_cs.cs-A-G1--goto-backend.in
+++ b/test/rlhc.d/case/scan3_cs.cs-A-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_cs.cs-A-T0--goto-backend.exp b/test/rlhc.d/case/scan3_cs.cs-A-T0--goto-backend.exp
index 9aa968c7..9aa968c7 100644
--- a/test/cases/rlhc.d/case/scan3_cs.cs-A-T0--goto-backend.exp
+++ b/test/rlhc.d/case/scan3_cs.cs-A-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_cs.cs-A-T0--goto-backend.in b/test/rlhc.d/case/scan3_cs.cs-A-T0--goto-backend.in
index 4feb6bd8..4feb6bd8 100644
--- a/test/cases/rlhc.d/case/scan3_cs.cs-A-T0--goto-backend.in
+++ b/test/rlhc.d/case/scan3_cs.cs-A-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_cs.cs-A-T0--var-backend.exp b/test/rlhc.d/case/scan3_cs.cs-A-T0--var-backend.exp
index 40a1f64d..40a1f64d 100644
--- a/test/cases/rlhc.d/case/scan3_cs.cs-A-T0--var-backend.exp
+++ b/test/rlhc.d/case/scan3_cs.cs-A-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_cs.cs-A-T0--var-backend.in b/test/rlhc.d/case/scan3_cs.cs-A-T0--var-backend.in
index 43e54b28..43e54b28 100644
--- a/test/cases/rlhc.d/case/scan3_cs.cs-A-T0--var-backend.in
+++ b/test/rlhc.d/case/scan3_cs.cs-A-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_cs.cs-A-T1--goto-backend.exp b/test/rlhc.d/case/scan3_cs.cs-A-T1--goto-backend.exp
index a7e1026b..a7e1026b 100644
--- a/test/cases/rlhc.d/case/scan3_cs.cs-A-T1--goto-backend.exp
+++ b/test/rlhc.d/case/scan3_cs.cs-A-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_cs.cs-A-T1--goto-backend.in b/test/rlhc.d/case/scan3_cs.cs-A-T1--goto-backend.in
index 5ac9b29c..5ac9b29c 100644
--- a/test/cases/rlhc.d/case/scan3_cs.cs-A-T1--goto-backend.in
+++ b/test/rlhc.d/case/scan3_cs.cs-A-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_cs.cs-A-T1--var-backend.exp b/test/rlhc.d/case/scan3_cs.cs-A-T1--var-backend.exp
index d276dd5e..d276dd5e 100644
--- a/test/cases/rlhc.d/case/scan3_cs.cs-A-T1--var-backend.exp
+++ b/test/rlhc.d/case/scan3_cs.cs-A-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_cs.cs-A-T1--var-backend.in b/test/rlhc.d/case/scan3_cs.cs-A-T1--var-backend.in
index b21be7c8..b21be7c8 100644
--- a/test/cases/rlhc.d/case/scan3_cs.cs-A-T1--var-backend.in
+++ b/test/rlhc.d/case/scan3_cs.cs-A-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_go.go-Z-F0--goto-backend.exp b/test/rlhc.d/case/scan3_go.go-Z-F0--goto-backend.exp
index e9f73ca6..e9f73ca6 100644
--- a/test/cases/rlhc.d/case/scan3_go.go-Z-F0--goto-backend.exp
+++ b/test/rlhc.d/case/scan3_go.go-Z-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_go.go-Z-F0--goto-backend.in b/test/rlhc.d/case/scan3_go.go-Z-F0--goto-backend.in
index 95b99aa6..95b99aa6 100644
--- a/test/cases/rlhc.d/case/scan3_go.go-Z-F0--goto-backend.in
+++ b/test/rlhc.d/case/scan3_go.go-Z-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_go.go-Z-F0--var-backend.exp b/test/rlhc.d/case/scan3_go.go-Z-F0--var-backend.exp
index 42ed98d8..42ed98d8 100644
--- a/test/cases/rlhc.d/case/scan3_go.go-Z-F0--var-backend.exp
+++ b/test/rlhc.d/case/scan3_go.go-Z-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_go.go-Z-F0--var-backend.in b/test/rlhc.d/case/scan3_go.go-Z-F0--var-backend.in
index ad804b24..ad804b24 100644
--- a/test/cases/rlhc.d/case/scan3_go.go-Z-F0--var-backend.in
+++ b/test/rlhc.d/case/scan3_go.go-Z-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_go.go-Z-F1--goto-backend.exp b/test/rlhc.d/case/scan3_go.go-Z-F1--goto-backend.exp
index 8e1c6fc1..8e1c6fc1 100644
--- a/test/cases/rlhc.d/case/scan3_go.go-Z-F1--goto-backend.exp
+++ b/test/rlhc.d/case/scan3_go.go-Z-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_go.go-Z-F1--goto-backend.in b/test/rlhc.d/case/scan3_go.go-Z-F1--goto-backend.in
index ae7d57da..ae7d57da 100644
--- a/test/cases/rlhc.d/case/scan3_go.go-Z-F1--goto-backend.in
+++ b/test/rlhc.d/case/scan3_go.go-Z-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_go.go-Z-F1--var-backend.exp b/test/rlhc.d/case/scan3_go.go-Z-F1--var-backend.exp
index 7b12b283..7b12b283 100644
--- a/test/cases/rlhc.d/case/scan3_go.go-Z-F1--var-backend.exp
+++ b/test/rlhc.d/case/scan3_go.go-Z-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_go.go-Z-F1--var-backend.in b/test/rlhc.d/case/scan3_go.go-Z-F1--var-backend.in
index 01389733..01389733 100644
--- a/test/cases/rlhc.d/case/scan3_go.go-Z-F1--var-backend.in
+++ b/test/rlhc.d/case/scan3_go.go-Z-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_go.go-Z-G0--goto-backend.exp b/test/rlhc.d/case/scan3_go.go-Z-G0--goto-backend.exp
index 85ae93a2..85ae93a2 100644
--- a/test/cases/rlhc.d/case/scan3_go.go-Z-G0--goto-backend.exp
+++ b/test/rlhc.d/case/scan3_go.go-Z-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_go.go-Z-G0--goto-backend.in b/test/rlhc.d/case/scan3_go.go-Z-G0--goto-backend.in
index 4227bff1..4227bff1 100644
--- a/test/cases/rlhc.d/case/scan3_go.go-Z-G0--goto-backend.in
+++ b/test/rlhc.d/case/scan3_go.go-Z-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_go.go-Z-G1--goto-backend.exp b/test/rlhc.d/case/scan3_go.go-Z-G1--goto-backend.exp
index 09a9f93a..09a9f93a 100644
--- a/test/cases/rlhc.d/case/scan3_go.go-Z-G1--goto-backend.exp
+++ b/test/rlhc.d/case/scan3_go.go-Z-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_go.go-Z-G1--goto-backend.in b/test/rlhc.d/case/scan3_go.go-Z-G1--goto-backend.in
index 7ca1e14a..7ca1e14a 100644
--- a/test/cases/rlhc.d/case/scan3_go.go-Z-G1--goto-backend.in
+++ b/test/rlhc.d/case/scan3_go.go-Z-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_go.go-Z-G2--goto-backend.exp b/test/rlhc.d/case/scan3_go.go-Z-G2--goto-backend.exp
index 3a7c0a48..3a7c0a48 100644
--- a/test/cases/rlhc.d/case/scan3_go.go-Z-G2--goto-backend.exp
+++ b/test/rlhc.d/case/scan3_go.go-Z-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_go.go-Z-G2--goto-backend.in b/test/rlhc.d/case/scan3_go.go-Z-G2--goto-backend.in
index fb34e226..fb34e226 100644
--- a/test/cases/rlhc.d/case/scan3_go.go-Z-G2--goto-backend.in
+++ b/test/rlhc.d/case/scan3_go.go-Z-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_go.go-Z-T0--goto-backend.exp b/test/rlhc.d/case/scan3_go.go-Z-T0--goto-backend.exp
index b91c8510..b91c8510 100644
--- a/test/cases/rlhc.d/case/scan3_go.go-Z-T0--goto-backend.exp
+++ b/test/rlhc.d/case/scan3_go.go-Z-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_go.go-Z-T0--goto-backend.in b/test/rlhc.d/case/scan3_go.go-Z-T0--goto-backend.in
index 953fc35a..953fc35a 100644
--- a/test/cases/rlhc.d/case/scan3_go.go-Z-T0--goto-backend.in
+++ b/test/rlhc.d/case/scan3_go.go-Z-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_go.go-Z-T0--var-backend.exp b/test/rlhc.d/case/scan3_go.go-Z-T0--var-backend.exp
index 23b4ac61..23b4ac61 100644
--- a/test/cases/rlhc.d/case/scan3_go.go-Z-T0--var-backend.exp
+++ b/test/rlhc.d/case/scan3_go.go-Z-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_go.go-Z-T0--var-backend.in b/test/rlhc.d/case/scan3_go.go-Z-T0--var-backend.in
index b246b512..b246b512 100644
--- a/test/cases/rlhc.d/case/scan3_go.go-Z-T0--var-backend.in
+++ b/test/rlhc.d/case/scan3_go.go-Z-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_go.go-Z-T1--goto-backend.exp b/test/rlhc.d/case/scan3_go.go-Z-T1--goto-backend.exp
index 097315bc..097315bc 100644
--- a/test/cases/rlhc.d/case/scan3_go.go-Z-T1--goto-backend.exp
+++ b/test/rlhc.d/case/scan3_go.go-Z-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_go.go-Z-T1--goto-backend.in b/test/rlhc.d/case/scan3_go.go-Z-T1--goto-backend.in
index b72d75f5..b72d75f5 100644
--- a/test/cases/rlhc.d/case/scan3_go.go-Z-T1--goto-backend.in
+++ b/test/rlhc.d/case/scan3_go.go-Z-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_go.go-Z-T1--var-backend.exp b/test/rlhc.d/case/scan3_go.go-Z-T1--var-backend.exp
index 5b1cfda3..5b1cfda3 100644
--- a/test/cases/rlhc.d/case/scan3_go.go-Z-T1--var-backend.exp
+++ b/test/rlhc.d/case/scan3_go.go-Z-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_go.go-Z-T1--var-backend.in b/test/rlhc.d/case/scan3_go.go-Z-T1--var-backend.in
index aac9a948..aac9a948 100644
--- a/test/cases/rlhc.d/case/scan3_go.go-Z-T1--var-backend.in
+++ b/test/rlhc.d/case/scan3_go.go-Z-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_java.java-J-F0--goto-backend.exp b/test/rlhc.d/case/scan3_java.java-J-F0--goto-backend.exp
index 01427e99..01427e99 100644
--- a/test/cases/rlhc.d/case/scan3_java.java-J-F0--goto-backend.exp
+++ b/test/rlhc.d/case/scan3_java.java-J-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_java.java-J-F0--goto-backend.in b/test/rlhc.d/case/scan3_java.java-J-F0--goto-backend.in
index dba817db..dba817db 100644
--- a/test/cases/rlhc.d/case/scan3_java.java-J-F0--goto-backend.in
+++ b/test/rlhc.d/case/scan3_java.java-J-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_java.java-J-F0--var-backend.exp b/test/rlhc.d/case/scan3_java.java-J-F0--var-backend.exp
index 7ca8e967..7ca8e967 100644
--- a/test/cases/rlhc.d/case/scan3_java.java-J-F0--var-backend.exp
+++ b/test/rlhc.d/case/scan3_java.java-J-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_java.java-J-F0--var-backend.in b/test/rlhc.d/case/scan3_java.java-J-F0--var-backend.in
index 4953042b..4953042b 100644
--- a/test/cases/rlhc.d/case/scan3_java.java-J-F0--var-backend.in
+++ b/test/rlhc.d/case/scan3_java.java-J-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_java.java-J-F1--goto-backend.exp b/test/rlhc.d/case/scan3_java.java-J-F1--goto-backend.exp
index 7caf664b..7caf664b 100644
--- a/test/cases/rlhc.d/case/scan3_java.java-J-F1--goto-backend.exp
+++ b/test/rlhc.d/case/scan3_java.java-J-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_java.java-J-F1--goto-backend.in b/test/rlhc.d/case/scan3_java.java-J-F1--goto-backend.in
index 54a7bc51..54a7bc51 100644
--- a/test/cases/rlhc.d/case/scan3_java.java-J-F1--goto-backend.in
+++ b/test/rlhc.d/case/scan3_java.java-J-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_java.java-J-F1--var-backend.exp b/test/rlhc.d/case/scan3_java.java-J-F1--var-backend.exp
index 4d7fe33d..4d7fe33d 100644
--- a/test/cases/rlhc.d/case/scan3_java.java-J-F1--var-backend.exp
+++ b/test/rlhc.d/case/scan3_java.java-J-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_java.java-J-F1--var-backend.in b/test/rlhc.d/case/scan3_java.java-J-F1--var-backend.in
index 75859cf2..75859cf2 100644
--- a/test/cases/rlhc.d/case/scan3_java.java-J-F1--var-backend.in
+++ b/test/rlhc.d/case/scan3_java.java-J-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_java.java-J-T0--goto-backend.exp b/test/rlhc.d/case/scan3_java.java-J-T0--goto-backend.exp
index c70047c0..c70047c0 100644
--- a/test/cases/rlhc.d/case/scan3_java.java-J-T0--goto-backend.exp
+++ b/test/rlhc.d/case/scan3_java.java-J-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_java.java-J-T0--goto-backend.in b/test/rlhc.d/case/scan3_java.java-J-T0--goto-backend.in
index 102e37e3..102e37e3 100644
--- a/test/cases/rlhc.d/case/scan3_java.java-J-T0--goto-backend.in
+++ b/test/rlhc.d/case/scan3_java.java-J-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_java.java-J-T0--var-backend.exp b/test/rlhc.d/case/scan3_java.java-J-T0--var-backend.exp
index 305d212d..305d212d 100644
--- a/test/cases/rlhc.d/case/scan3_java.java-J-T0--var-backend.exp
+++ b/test/rlhc.d/case/scan3_java.java-J-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_java.java-J-T0--var-backend.in b/test/rlhc.d/case/scan3_java.java-J-T0--var-backend.in
index 70a9d229..70a9d229 100644
--- a/test/cases/rlhc.d/case/scan3_java.java-J-T0--var-backend.in
+++ b/test/rlhc.d/case/scan3_java.java-J-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_java.java-J-T1--goto-backend.exp b/test/rlhc.d/case/scan3_java.java-J-T1--goto-backend.exp
index 242208bf..242208bf 100644
--- a/test/cases/rlhc.d/case/scan3_java.java-J-T1--goto-backend.exp
+++ b/test/rlhc.d/case/scan3_java.java-J-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_java.java-J-T1--goto-backend.in b/test/rlhc.d/case/scan3_java.java-J-T1--goto-backend.in
index f2ab5d95..f2ab5d95 100644
--- a/test/cases/rlhc.d/case/scan3_java.java-J-T1--goto-backend.in
+++ b/test/rlhc.d/case/scan3_java.java-J-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_java.java-J-T1--var-backend.exp b/test/rlhc.d/case/scan3_java.java-J-T1--var-backend.exp
index ae2557af..ae2557af 100644
--- a/test/cases/rlhc.d/case/scan3_java.java-J-T1--var-backend.exp
+++ b/test/rlhc.d/case/scan3_java.java-J-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_java.java-J-T1--var-backend.in b/test/rlhc.d/case/scan3_java.java-J-T1--var-backend.in
index d485ee2c..d485ee2c 100644
--- a/test/cases/rlhc.d/case/scan3_java.java-J-T1--var-backend.in
+++ b/test/rlhc.d/case/scan3_java.java-J-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_julia.jl-Y-F0--var-backend.exp b/test/rlhc.d/case/scan3_julia.jl-Y-F0--var-backend.exp
index bdd9a6ba..bdd9a6ba 100644
--- a/test/cases/rlhc.d/case/scan3_julia.jl-Y-F0--var-backend.exp
+++ b/test/rlhc.d/case/scan3_julia.jl-Y-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_julia.jl-Y-F0--var-backend.in b/test/rlhc.d/case/scan3_julia.jl-Y-F0--var-backend.in
index 1a382a87..1a382a87 100644
--- a/test/cases/rlhc.d/case/scan3_julia.jl-Y-F0--var-backend.in
+++ b/test/rlhc.d/case/scan3_julia.jl-Y-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_julia.jl-Y-F1--var-backend.exp b/test/rlhc.d/case/scan3_julia.jl-Y-F1--var-backend.exp
index 2eba3576..2eba3576 100644
--- a/test/cases/rlhc.d/case/scan3_julia.jl-Y-F1--var-backend.exp
+++ b/test/rlhc.d/case/scan3_julia.jl-Y-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_julia.jl-Y-F1--var-backend.in b/test/rlhc.d/case/scan3_julia.jl-Y-F1--var-backend.in
index e7da5439..e7da5439 100644
--- a/test/cases/rlhc.d/case/scan3_julia.jl-Y-F1--var-backend.in
+++ b/test/rlhc.d/case/scan3_julia.jl-Y-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_julia.jl-Y-T0--var-backend.exp b/test/rlhc.d/case/scan3_julia.jl-Y-T0--var-backend.exp
index af99977b..af99977b 100644
--- a/test/cases/rlhc.d/case/scan3_julia.jl-Y-T0--var-backend.exp
+++ b/test/rlhc.d/case/scan3_julia.jl-Y-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_julia.jl-Y-T0--var-backend.in b/test/rlhc.d/case/scan3_julia.jl-Y-T0--var-backend.in
index 6d83f7cb..6d83f7cb 100644
--- a/test/cases/rlhc.d/case/scan3_julia.jl-Y-T0--var-backend.in
+++ b/test/rlhc.d/case/scan3_julia.jl-Y-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_julia.jl-Y-T1--var-backend.exp b/test/rlhc.d/case/scan3_julia.jl-Y-T1--var-backend.exp
index 36dfdc19..36dfdc19 100644
--- a/test/cases/rlhc.d/case/scan3_julia.jl-Y-T1--var-backend.exp
+++ b/test/rlhc.d/case/scan3_julia.jl-Y-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_julia.jl-Y-T1--var-backend.in b/test/rlhc.d/case/scan3_julia.jl-Y-T1--var-backend.in
index d1ae7c11..d1ae7c11 100644
--- a/test/cases/rlhc.d/case/scan3_julia.jl-Y-T1--var-backend.in
+++ b/test/rlhc.d/case/scan3_julia.jl-Y-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_ocaml.ml-O-F0--var-backend.exp b/test/rlhc.d/case/scan3_ocaml.ml-O-F0--var-backend.exp
index d0f99127..d0f99127 100644
--- a/test/cases/rlhc.d/case/scan3_ocaml.ml-O-F0--var-backend.exp
+++ b/test/rlhc.d/case/scan3_ocaml.ml-O-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_ocaml.ml-O-F0--var-backend.in b/test/rlhc.d/case/scan3_ocaml.ml-O-F0--var-backend.in
index 9997d32e..9997d32e 100644
--- a/test/cases/rlhc.d/case/scan3_ocaml.ml-O-F0--var-backend.in
+++ b/test/rlhc.d/case/scan3_ocaml.ml-O-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_ocaml.ml-O-F1--var-backend.exp b/test/rlhc.d/case/scan3_ocaml.ml-O-F1--var-backend.exp
index b3a4e35c..b3a4e35c 100644
--- a/test/cases/rlhc.d/case/scan3_ocaml.ml-O-F1--var-backend.exp
+++ b/test/rlhc.d/case/scan3_ocaml.ml-O-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_ocaml.ml-O-F1--var-backend.in b/test/rlhc.d/case/scan3_ocaml.ml-O-F1--var-backend.in
index 871f2329..871f2329 100644
--- a/test/cases/rlhc.d/case/scan3_ocaml.ml-O-F1--var-backend.in
+++ b/test/rlhc.d/case/scan3_ocaml.ml-O-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_ocaml.ml-O-T0--var-backend.exp b/test/rlhc.d/case/scan3_ocaml.ml-O-T0--var-backend.exp
index 1e69a85c..1e69a85c 100644
--- a/test/cases/rlhc.d/case/scan3_ocaml.ml-O-T0--var-backend.exp
+++ b/test/rlhc.d/case/scan3_ocaml.ml-O-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_ocaml.ml-O-T0--var-backend.in b/test/rlhc.d/case/scan3_ocaml.ml-O-T0--var-backend.in
index a2b00de7..a2b00de7 100644
--- a/test/cases/rlhc.d/case/scan3_ocaml.ml-O-T0--var-backend.in
+++ b/test/rlhc.d/case/scan3_ocaml.ml-O-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_ocaml.ml-O-T1--var-backend.exp b/test/rlhc.d/case/scan3_ocaml.ml-O-T1--var-backend.exp
index 22a34edf..22a34edf 100644
--- a/test/cases/rlhc.d/case/scan3_ocaml.ml-O-T1--var-backend.exp
+++ b/test/rlhc.d/case/scan3_ocaml.ml-O-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_ocaml.ml-O-T1--var-backend.in b/test/rlhc.d/case/scan3_ocaml.ml-O-T1--var-backend.in
index df9be436..df9be436 100644
--- a/test/cases/rlhc.d/case/scan3_ocaml.ml-O-T1--var-backend.in
+++ b/test/rlhc.d/case/scan3_ocaml.ml-O-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_ruby.rb-R-F0--var-backend.exp b/test/rlhc.d/case/scan3_ruby.rb-R-F0--var-backend.exp
index a680c393..a680c393 100644
--- a/test/cases/rlhc.d/case/scan3_ruby.rb-R-F0--var-backend.exp
+++ b/test/rlhc.d/case/scan3_ruby.rb-R-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_ruby.rb-R-F0--var-backend.in b/test/rlhc.d/case/scan3_ruby.rb-R-F0--var-backend.in
index 0203111f..0203111f 100644
--- a/test/cases/rlhc.d/case/scan3_ruby.rb-R-F0--var-backend.in
+++ b/test/rlhc.d/case/scan3_ruby.rb-R-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_ruby.rb-R-F1--var-backend.exp b/test/rlhc.d/case/scan3_ruby.rb-R-F1--var-backend.exp
index 0da2bcd4..0da2bcd4 100644
--- a/test/cases/rlhc.d/case/scan3_ruby.rb-R-F1--var-backend.exp
+++ b/test/rlhc.d/case/scan3_ruby.rb-R-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_ruby.rb-R-F1--var-backend.in b/test/rlhc.d/case/scan3_ruby.rb-R-F1--var-backend.in
index f493e4e3..f493e4e3 100644
--- a/test/cases/rlhc.d/case/scan3_ruby.rb-R-F1--var-backend.in
+++ b/test/rlhc.d/case/scan3_ruby.rb-R-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_ruby.rb-R-T0--var-backend.exp b/test/rlhc.d/case/scan3_ruby.rb-R-T0--var-backend.exp
index 0920117f..0920117f 100644
--- a/test/cases/rlhc.d/case/scan3_ruby.rb-R-T0--var-backend.exp
+++ b/test/rlhc.d/case/scan3_ruby.rb-R-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_ruby.rb-R-T0--var-backend.in b/test/rlhc.d/case/scan3_ruby.rb-R-T0--var-backend.in
index 5b35cbcb..5b35cbcb 100644
--- a/test/cases/rlhc.d/case/scan3_ruby.rb-R-T0--var-backend.in
+++ b/test/rlhc.d/case/scan3_ruby.rb-R-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_ruby.rb-R-T1--var-backend.exp b/test/rlhc.d/case/scan3_ruby.rb-R-T1--var-backend.exp
index 3f95ee76..3f95ee76 100644
--- a/test/cases/rlhc.d/case/scan3_ruby.rb-R-T1--var-backend.exp
+++ b/test/rlhc.d/case/scan3_ruby.rb-R-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_ruby.rb-R-T1--var-backend.in b/test/rlhc.d/case/scan3_ruby.rb-R-T1--var-backend.in
index 9116a40b..9116a40b 100644
--- a/test/cases/rlhc.d/case/scan3_ruby.rb-R-T1--var-backend.in
+++ b/test/rlhc.d/case/scan3_ruby.rb-R-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_rust.rs-U-F0--var-backend.exp b/test/rlhc.d/case/scan3_rust.rs-U-F0--var-backend.exp
index 6a6ff51f..6a6ff51f 100644
--- a/test/cases/rlhc.d/case/scan3_rust.rs-U-F0--var-backend.exp
+++ b/test/rlhc.d/case/scan3_rust.rs-U-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_rust.rs-U-F0--var-backend.in b/test/rlhc.d/case/scan3_rust.rs-U-F0--var-backend.in
index 9acddcaa..9acddcaa 100644
--- a/test/cases/rlhc.d/case/scan3_rust.rs-U-F0--var-backend.in
+++ b/test/rlhc.d/case/scan3_rust.rs-U-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_rust.rs-U-F1--var-backend.exp b/test/rlhc.d/case/scan3_rust.rs-U-F1--var-backend.exp
index ebbd16a1..ebbd16a1 100644
--- a/test/cases/rlhc.d/case/scan3_rust.rs-U-F1--var-backend.exp
+++ b/test/rlhc.d/case/scan3_rust.rs-U-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_rust.rs-U-F1--var-backend.in b/test/rlhc.d/case/scan3_rust.rs-U-F1--var-backend.in
index 4af75952..4af75952 100644
--- a/test/cases/rlhc.d/case/scan3_rust.rs-U-F1--var-backend.in
+++ b/test/rlhc.d/case/scan3_rust.rs-U-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_rust.rs-U-T0--var-backend.exp b/test/rlhc.d/case/scan3_rust.rs-U-T0--var-backend.exp
index 6c710b79..6c710b79 100644
--- a/test/cases/rlhc.d/case/scan3_rust.rs-U-T0--var-backend.exp
+++ b/test/rlhc.d/case/scan3_rust.rs-U-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_rust.rs-U-T0--var-backend.in b/test/rlhc.d/case/scan3_rust.rs-U-T0--var-backend.in
index ff9b2fed..ff9b2fed 100644
--- a/test/cases/rlhc.d/case/scan3_rust.rs-U-T0--var-backend.in
+++ b/test/rlhc.d/case/scan3_rust.rs-U-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan3_rust.rs-U-T1--var-backend.exp b/test/rlhc.d/case/scan3_rust.rs-U-T1--var-backend.exp
index 91fabf73..91fabf73 100644
--- a/test/cases/rlhc.d/case/scan3_rust.rs-U-T1--var-backend.exp
+++ b/test/rlhc.d/case/scan3_rust.rs-U-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan3_rust.rs-U-T1--var-backend.in b/test/rlhc.d/case/scan3_rust.rs-U-T1--var-backend.in
index bcd824c1..bcd824c1 100644
--- a/test/cases/rlhc.d/case/scan3_rust.rs-U-T1--var-backend.in
+++ b/test/rlhc.d/case/scan3_rust.rs-U-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_c.c-C-F0--goto-backend.exp b/test/rlhc.d/case/scan4_c.c-C-F0--goto-backend.exp
index 9f519ccb..9f519ccb 100644
--- a/test/cases/rlhc.d/case/scan4_c.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/scan4_c.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_c.c-C-F0--goto-backend.in b/test/rlhc.d/case/scan4_c.c-C-F0--goto-backend.in
index e4ca5211..e4ca5211 100644
--- a/test/cases/rlhc.d/case/scan4_c.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/scan4_c.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_c.c-C-F0--var-backend.exp b/test/rlhc.d/case/scan4_c.c-C-F0--var-backend.exp
index c60a061a..c60a061a 100644
--- a/test/cases/rlhc.d/case/scan4_c.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/scan4_c.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_c.c-C-F0--var-backend.in b/test/rlhc.d/case/scan4_c.c-C-F0--var-backend.in
index 806c79b5..806c79b5 100644
--- a/test/cases/rlhc.d/case/scan4_c.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/scan4_c.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_c.c-C-F1--goto-backend.exp b/test/rlhc.d/case/scan4_c.c-C-F1--goto-backend.exp
index be07a3b9..be07a3b9 100644
--- a/test/cases/rlhc.d/case/scan4_c.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/scan4_c.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_c.c-C-F1--goto-backend.in b/test/rlhc.d/case/scan4_c.c-C-F1--goto-backend.in
index dfbef435..dfbef435 100644
--- a/test/cases/rlhc.d/case/scan4_c.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/scan4_c.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_c.c-C-F1--var-backend.exp b/test/rlhc.d/case/scan4_c.c-C-F1--var-backend.exp
index f0c3d2b1..f0c3d2b1 100644
--- a/test/cases/rlhc.d/case/scan4_c.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/scan4_c.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_c.c-C-F1--var-backend.in b/test/rlhc.d/case/scan4_c.c-C-F1--var-backend.in
index bacb3665..bacb3665 100644
--- a/test/cases/rlhc.d/case/scan4_c.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/scan4_c.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_c.c-C-G0--goto-backend.exp b/test/rlhc.d/case/scan4_c.c-C-G0--goto-backend.exp
index 670fcf3d..670fcf3d 100644
--- a/test/cases/rlhc.d/case/scan4_c.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/scan4_c.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_c.c-C-G0--goto-backend.in b/test/rlhc.d/case/scan4_c.c-C-G0--goto-backend.in
index 0107c3cf..0107c3cf 100644
--- a/test/cases/rlhc.d/case/scan4_c.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/scan4_c.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_c.c-C-G1--goto-backend.exp b/test/rlhc.d/case/scan4_c.c-C-G1--goto-backend.exp
index f60b2610..f60b2610 100644
--- a/test/cases/rlhc.d/case/scan4_c.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/scan4_c.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_c.c-C-G1--goto-backend.in b/test/rlhc.d/case/scan4_c.c-C-G1--goto-backend.in
index a0b65a69..a0b65a69 100644
--- a/test/cases/rlhc.d/case/scan4_c.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/scan4_c.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_c.c-C-G2--goto-backend.exp b/test/rlhc.d/case/scan4_c.c-C-G2--goto-backend.exp
index a1cc787c..a1cc787c 100644
--- a/test/cases/rlhc.d/case/scan4_c.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/scan4_c.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_c.c-C-G2--goto-backend.in b/test/rlhc.d/case/scan4_c.c-C-G2--goto-backend.in
index 8762c28a..8762c28a 100644
--- a/test/cases/rlhc.d/case/scan4_c.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/scan4_c.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_c.c-C-T0--goto-backend.exp b/test/rlhc.d/case/scan4_c.c-C-T0--goto-backend.exp
index 9287de4c..9287de4c 100644
--- a/test/cases/rlhc.d/case/scan4_c.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/scan4_c.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_c.c-C-T0--goto-backend.in b/test/rlhc.d/case/scan4_c.c-C-T0--goto-backend.in
index c9e677eb..c9e677eb 100644
--- a/test/cases/rlhc.d/case/scan4_c.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/scan4_c.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_c.c-C-T0--var-backend.exp b/test/rlhc.d/case/scan4_c.c-C-T0--var-backend.exp
index 51ea05df..51ea05df 100644
--- a/test/cases/rlhc.d/case/scan4_c.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/scan4_c.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_c.c-C-T0--var-backend.in b/test/rlhc.d/case/scan4_c.c-C-T0--var-backend.in
index 2ffb0c68..2ffb0c68 100644
--- a/test/cases/rlhc.d/case/scan4_c.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/scan4_c.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_c.c-C-T1--goto-backend.exp b/test/rlhc.d/case/scan4_c.c-C-T1--goto-backend.exp
index 53dcb0fd..53dcb0fd 100644
--- a/test/cases/rlhc.d/case/scan4_c.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/scan4_c.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_c.c-C-T1--goto-backend.in b/test/rlhc.d/case/scan4_c.c-C-T1--goto-backend.in
index fbd2b922..fbd2b922 100644
--- a/test/cases/rlhc.d/case/scan4_c.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/scan4_c.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_c.c-C-T1--var-backend.exp b/test/rlhc.d/case/scan4_c.c-C-T1--var-backend.exp
index d299cc87..d299cc87 100644
--- a/test/cases/rlhc.d/case/scan4_c.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/scan4_c.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_c.c-C-T1--var-backend.in b/test/rlhc.d/case/scan4_c.c-C-T1--var-backend.in
index 8e6570c1..8e6570c1 100644
--- a/test/cases/rlhc.d/case/scan4_c.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/scan4_c.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_crack.crk-K-F0--var-backend.exp b/test/rlhc.d/case/scan4_crack.crk-K-F0--var-backend.exp
index 0c842afc..0c842afc 100644
--- a/test/cases/rlhc.d/case/scan4_crack.crk-K-F0--var-backend.exp
+++ b/test/rlhc.d/case/scan4_crack.crk-K-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_crack.crk-K-F0--var-backend.in b/test/rlhc.d/case/scan4_crack.crk-K-F0--var-backend.in
index 089ef7d0..089ef7d0 100644
--- a/test/cases/rlhc.d/case/scan4_crack.crk-K-F0--var-backend.in
+++ b/test/rlhc.d/case/scan4_crack.crk-K-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_crack.crk-K-F1--var-backend.exp b/test/rlhc.d/case/scan4_crack.crk-K-F1--var-backend.exp
index dcf8a293..dcf8a293 100644
--- a/test/cases/rlhc.d/case/scan4_crack.crk-K-F1--var-backend.exp
+++ b/test/rlhc.d/case/scan4_crack.crk-K-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_crack.crk-K-F1--var-backend.in b/test/rlhc.d/case/scan4_crack.crk-K-F1--var-backend.in
index 2970cada..2970cada 100644
--- a/test/cases/rlhc.d/case/scan4_crack.crk-K-F1--var-backend.in
+++ b/test/rlhc.d/case/scan4_crack.crk-K-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_crack.crk-K-T0--var-backend.exp b/test/rlhc.d/case/scan4_crack.crk-K-T0--var-backend.exp
index 19c74d7f..19c74d7f 100644
--- a/test/cases/rlhc.d/case/scan4_crack.crk-K-T0--var-backend.exp
+++ b/test/rlhc.d/case/scan4_crack.crk-K-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_crack.crk-K-T0--var-backend.in b/test/rlhc.d/case/scan4_crack.crk-K-T0--var-backend.in
index c3c3753d..c3c3753d 100644
--- a/test/cases/rlhc.d/case/scan4_crack.crk-K-T0--var-backend.in
+++ b/test/rlhc.d/case/scan4_crack.crk-K-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_crack.crk-K-T1--var-backend.exp b/test/rlhc.d/case/scan4_crack.crk-K-T1--var-backend.exp
index 32f28494..32f28494 100644
--- a/test/cases/rlhc.d/case/scan4_crack.crk-K-T1--var-backend.exp
+++ b/test/rlhc.d/case/scan4_crack.crk-K-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_crack.crk-K-T1--var-backend.in b/test/rlhc.d/case/scan4_crack.crk-K-T1--var-backend.in
index 56e5d814..56e5d814 100644
--- a/test/cases/rlhc.d/case/scan4_crack.crk-K-T1--var-backend.in
+++ b/test/rlhc.d/case/scan4_crack.crk-K-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_cs.cs-A-F0--goto-backend.exp b/test/rlhc.d/case/scan4_cs.cs-A-F0--goto-backend.exp
index ea989ec9..ea989ec9 100644
--- a/test/cases/rlhc.d/case/scan4_cs.cs-A-F0--goto-backend.exp
+++ b/test/rlhc.d/case/scan4_cs.cs-A-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_cs.cs-A-F0--goto-backend.in b/test/rlhc.d/case/scan4_cs.cs-A-F0--goto-backend.in
index 8652e838..8652e838 100644
--- a/test/cases/rlhc.d/case/scan4_cs.cs-A-F0--goto-backend.in
+++ b/test/rlhc.d/case/scan4_cs.cs-A-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_cs.cs-A-F0--var-backend.exp b/test/rlhc.d/case/scan4_cs.cs-A-F0--var-backend.exp
index 9cfc4705..9cfc4705 100644
--- a/test/cases/rlhc.d/case/scan4_cs.cs-A-F0--var-backend.exp
+++ b/test/rlhc.d/case/scan4_cs.cs-A-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_cs.cs-A-F0--var-backend.in b/test/rlhc.d/case/scan4_cs.cs-A-F0--var-backend.in
index 2b9ec283..2b9ec283 100644
--- a/test/cases/rlhc.d/case/scan4_cs.cs-A-F0--var-backend.in
+++ b/test/rlhc.d/case/scan4_cs.cs-A-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_cs.cs-A-F1--goto-backend.exp b/test/rlhc.d/case/scan4_cs.cs-A-F1--goto-backend.exp
index 95f8e92a..95f8e92a 100644
--- a/test/cases/rlhc.d/case/scan4_cs.cs-A-F1--goto-backend.exp
+++ b/test/rlhc.d/case/scan4_cs.cs-A-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_cs.cs-A-F1--goto-backend.in b/test/rlhc.d/case/scan4_cs.cs-A-F1--goto-backend.in
index 5afc15ec..5afc15ec 100644
--- a/test/cases/rlhc.d/case/scan4_cs.cs-A-F1--goto-backend.in
+++ b/test/rlhc.d/case/scan4_cs.cs-A-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_cs.cs-A-F1--var-backend.exp b/test/rlhc.d/case/scan4_cs.cs-A-F1--var-backend.exp
index 188d1036..188d1036 100644
--- a/test/cases/rlhc.d/case/scan4_cs.cs-A-F1--var-backend.exp
+++ b/test/rlhc.d/case/scan4_cs.cs-A-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_cs.cs-A-F1--var-backend.in b/test/rlhc.d/case/scan4_cs.cs-A-F1--var-backend.in
index 9ab466ae..9ab466ae 100644
--- a/test/cases/rlhc.d/case/scan4_cs.cs-A-F1--var-backend.in
+++ b/test/rlhc.d/case/scan4_cs.cs-A-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_cs.cs-A-G0--goto-backend.exp b/test/rlhc.d/case/scan4_cs.cs-A-G0--goto-backend.exp
index d674fe6c..d674fe6c 100644
--- a/test/cases/rlhc.d/case/scan4_cs.cs-A-G0--goto-backend.exp
+++ b/test/rlhc.d/case/scan4_cs.cs-A-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_cs.cs-A-G0--goto-backend.in b/test/rlhc.d/case/scan4_cs.cs-A-G0--goto-backend.in
index dfcc868f..dfcc868f 100644
--- a/test/cases/rlhc.d/case/scan4_cs.cs-A-G0--goto-backend.in
+++ b/test/rlhc.d/case/scan4_cs.cs-A-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_cs.cs-A-G1--goto-backend.exp b/test/rlhc.d/case/scan4_cs.cs-A-G1--goto-backend.exp
index b2d9a6ad..b2d9a6ad 100644
--- a/test/cases/rlhc.d/case/scan4_cs.cs-A-G1--goto-backend.exp
+++ b/test/rlhc.d/case/scan4_cs.cs-A-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_cs.cs-A-G1--goto-backend.in b/test/rlhc.d/case/scan4_cs.cs-A-G1--goto-backend.in
index 33022a67..33022a67 100644
--- a/test/cases/rlhc.d/case/scan4_cs.cs-A-G1--goto-backend.in
+++ b/test/rlhc.d/case/scan4_cs.cs-A-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_cs.cs-A-T0--goto-backend.exp b/test/rlhc.d/case/scan4_cs.cs-A-T0--goto-backend.exp
index b2fd5f53..b2fd5f53 100644
--- a/test/cases/rlhc.d/case/scan4_cs.cs-A-T0--goto-backend.exp
+++ b/test/rlhc.d/case/scan4_cs.cs-A-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_cs.cs-A-T0--goto-backend.in b/test/rlhc.d/case/scan4_cs.cs-A-T0--goto-backend.in
index 6d06db36..6d06db36 100644
--- a/test/cases/rlhc.d/case/scan4_cs.cs-A-T0--goto-backend.in
+++ b/test/rlhc.d/case/scan4_cs.cs-A-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_cs.cs-A-T0--var-backend.exp b/test/rlhc.d/case/scan4_cs.cs-A-T0--var-backend.exp
index ad209e6e..ad209e6e 100644
--- a/test/cases/rlhc.d/case/scan4_cs.cs-A-T0--var-backend.exp
+++ b/test/rlhc.d/case/scan4_cs.cs-A-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_cs.cs-A-T0--var-backend.in b/test/rlhc.d/case/scan4_cs.cs-A-T0--var-backend.in
index 7e8b796e..7e8b796e 100644
--- a/test/cases/rlhc.d/case/scan4_cs.cs-A-T0--var-backend.in
+++ b/test/rlhc.d/case/scan4_cs.cs-A-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_cs.cs-A-T1--goto-backend.exp b/test/rlhc.d/case/scan4_cs.cs-A-T1--goto-backend.exp
index e5c755cd..e5c755cd 100644
--- a/test/cases/rlhc.d/case/scan4_cs.cs-A-T1--goto-backend.exp
+++ b/test/rlhc.d/case/scan4_cs.cs-A-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_cs.cs-A-T1--goto-backend.in b/test/rlhc.d/case/scan4_cs.cs-A-T1--goto-backend.in
index 3aeb8e90..3aeb8e90 100644
--- a/test/cases/rlhc.d/case/scan4_cs.cs-A-T1--goto-backend.in
+++ b/test/rlhc.d/case/scan4_cs.cs-A-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_cs.cs-A-T1--var-backend.exp b/test/rlhc.d/case/scan4_cs.cs-A-T1--var-backend.exp
index 1a71068b..1a71068b 100644
--- a/test/cases/rlhc.d/case/scan4_cs.cs-A-T1--var-backend.exp
+++ b/test/rlhc.d/case/scan4_cs.cs-A-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_cs.cs-A-T1--var-backend.in b/test/rlhc.d/case/scan4_cs.cs-A-T1--var-backend.in
index 97d735c4..97d735c4 100644
--- a/test/cases/rlhc.d/case/scan4_cs.cs-A-T1--var-backend.in
+++ b/test/rlhc.d/case/scan4_cs.cs-A-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_go.go-Z-F0--goto-backend.exp b/test/rlhc.d/case/scan4_go.go-Z-F0--goto-backend.exp
index 28eec584..28eec584 100644
--- a/test/cases/rlhc.d/case/scan4_go.go-Z-F0--goto-backend.exp
+++ b/test/rlhc.d/case/scan4_go.go-Z-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_go.go-Z-F0--goto-backend.in b/test/rlhc.d/case/scan4_go.go-Z-F0--goto-backend.in
index d9c609c5..d9c609c5 100644
--- a/test/cases/rlhc.d/case/scan4_go.go-Z-F0--goto-backend.in
+++ b/test/rlhc.d/case/scan4_go.go-Z-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_go.go-Z-F0--var-backend.exp b/test/rlhc.d/case/scan4_go.go-Z-F0--var-backend.exp
index 1f682e75..1f682e75 100644
--- a/test/cases/rlhc.d/case/scan4_go.go-Z-F0--var-backend.exp
+++ b/test/rlhc.d/case/scan4_go.go-Z-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_go.go-Z-F0--var-backend.in b/test/rlhc.d/case/scan4_go.go-Z-F0--var-backend.in
index 3036f025..3036f025 100644
--- a/test/cases/rlhc.d/case/scan4_go.go-Z-F0--var-backend.in
+++ b/test/rlhc.d/case/scan4_go.go-Z-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_go.go-Z-F1--goto-backend.exp b/test/rlhc.d/case/scan4_go.go-Z-F1--goto-backend.exp
index 49e36acc..49e36acc 100644
--- a/test/cases/rlhc.d/case/scan4_go.go-Z-F1--goto-backend.exp
+++ b/test/rlhc.d/case/scan4_go.go-Z-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_go.go-Z-F1--goto-backend.in b/test/rlhc.d/case/scan4_go.go-Z-F1--goto-backend.in
index d4a78db6..d4a78db6 100644
--- a/test/cases/rlhc.d/case/scan4_go.go-Z-F1--goto-backend.in
+++ b/test/rlhc.d/case/scan4_go.go-Z-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_go.go-Z-F1--var-backend.exp b/test/rlhc.d/case/scan4_go.go-Z-F1--var-backend.exp
index af03630d..af03630d 100644
--- a/test/cases/rlhc.d/case/scan4_go.go-Z-F1--var-backend.exp
+++ b/test/rlhc.d/case/scan4_go.go-Z-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_go.go-Z-F1--var-backend.in b/test/rlhc.d/case/scan4_go.go-Z-F1--var-backend.in
index f67443d0..f67443d0 100644
--- a/test/cases/rlhc.d/case/scan4_go.go-Z-F1--var-backend.in
+++ b/test/rlhc.d/case/scan4_go.go-Z-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_go.go-Z-G0--goto-backend.exp b/test/rlhc.d/case/scan4_go.go-Z-G0--goto-backend.exp
index 8493a758..8493a758 100644
--- a/test/cases/rlhc.d/case/scan4_go.go-Z-G0--goto-backend.exp
+++ b/test/rlhc.d/case/scan4_go.go-Z-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_go.go-Z-G0--goto-backend.in b/test/rlhc.d/case/scan4_go.go-Z-G0--goto-backend.in
index eb8a2eee..eb8a2eee 100644
--- a/test/cases/rlhc.d/case/scan4_go.go-Z-G0--goto-backend.in
+++ b/test/rlhc.d/case/scan4_go.go-Z-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_go.go-Z-G1--goto-backend.exp b/test/rlhc.d/case/scan4_go.go-Z-G1--goto-backend.exp
index 6bfef1cf..6bfef1cf 100644
--- a/test/cases/rlhc.d/case/scan4_go.go-Z-G1--goto-backend.exp
+++ b/test/rlhc.d/case/scan4_go.go-Z-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_go.go-Z-G1--goto-backend.in b/test/rlhc.d/case/scan4_go.go-Z-G1--goto-backend.in
index 6d54a89b..6d54a89b 100644
--- a/test/cases/rlhc.d/case/scan4_go.go-Z-G1--goto-backend.in
+++ b/test/rlhc.d/case/scan4_go.go-Z-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_go.go-Z-G2--goto-backend.exp b/test/rlhc.d/case/scan4_go.go-Z-G2--goto-backend.exp
index 47cdac07..47cdac07 100644
--- a/test/cases/rlhc.d/case/scan4_go.go-Z-G2--goto-backend.exp
+++ b/test/rlhc.d/case/scan4_go.go-Z-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_go.go-Z-G2--goto-backend.in b/test/rlhc.d/case/scan4_go.go-Z-G2--goto-backend.in
index cfcb9c8e..cfcb9c8e 100644
--- a/test/cases/rlhc.d/case/scan4_go.go-Z-G2--goto-backend.in
+++ b/test/rlhc.d/case/scan4_go.go-Z-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_go.go-Z-T0--goto-backend.exp b/test/rlhc.d/case/scan4_go.go-Z-T0--goto-backend.exp
index 86c34914..86c34914 100644
--- a/test/cases/rlhc.d/case/scan4_go.go-Z-T0--goto-backend.exp
+++ b/test/rlhc.d/case/scan4_go.go-Z-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_go.go-Z-T0--goto-backend.in b/test/rlhc.d/case/scan4_go.go-Z-T0--goto-backend.in
index f14b32da..f14b32da 100644
--- a/test/cases/rlhc.d/case/scan4_go.go-Z-T0--goto-backend.in
+++ b/test/rlhc.d/case/scan4_go.go-Z-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_go.go-Z-T0--var-backend.exp b/test/rlhc.d/case/scan4_go.go-Z-T0--var-backend.exp
index f136f158..f136f158 100644
--- a/test/cases/rlhc.d/case/scan4_go.go-Z-T0--var-backend.exp
+++ b/test/rlhc.d/case/scan4_go.go-Z-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_go.go-Z-T0--var-backend.in b/test/rlhc.d/case/scan4_go.go-Z-T0--var-backend.in
index 55a11d62..55a11d62 100644
--- a/test/cases/rlhc.d/case/scan4_go.go-Z-T0--var-backend.in
+++ b/test/rlhc.d/case/scan4_go.go-Z-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_go.go-Z-T1--goto-backend.exp b/test/rlhc.d/case/scan4_go.go-Z-T1--goto-backend.exp
index 13271daf..13271daf 100644
--- a/test/cases/rlhc.d/case/scan4_go.go-Z-T1--goto-backend.exp
+++ b/test/rlhc.d/case/scan4_go.go-Z-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_go.go-Z-T1--goto-backend.in b/test/rlhc.d/case/scan4_go.go-Z-T1--goto-backend.in
index b3dfa560..b3dfa560 100644
--- a/test/cases/rlhc.d/case/scan4_go.go-Z-T1--goto-backend.in
+++ b/test/rlhc.d/case/scan4_go.go-Z-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_go.go-Z-T1--var-backend.exp b/test/rlhc.d/case/scan4_go.go-Z-T1--var-backend.exp
index ea45e73e..ea45e73e 100644
--- a/test/cases/rlhc.d/case/scan4_go.go-Z-T1--var-backend.exp
+++ b/test/rlhc.d/case/scan4_go.go-Z-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_go.go-Z-T1--var-backend.in b/test/rlhc.d/case/scan4_go.go-Z-T1--var-backend.in
index b6fd746b..b6fd746b 100644
--- a/test/cases/rlhc.d/case/scan4_go.go-Z-T1--var-backend.in
+++ b/test/rlhc.d/case/scan4_go.go-Z-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_java.java-J-F0--goto-backend.exp b/test/rlhc.d/case/scan4_java.java-J-F0--goto-backend.exp
index ce2da183..ce2da183 100644
--- a/test/cases/rlhc.d/case/scan4_java.java-J-F0--goto-backend.exp
+++ b/test/rlhc.d/case/scan4_java.java-J-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_java.java-J-F0--goto-backend.in b/test/rlhc.d/case/scan4_java.java-J-F0--goto-backend.in
index 973d8be3..973d8be3 100644
--- a/test/cases/rlhc.d/case/scan4_java.java-J-F0--goto-backend.in
+++ b/test/rlhc.d/case/scan4_java.java-J-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_java.java-J-F0--var-backend.exp b/test/rlhc.d/case/scan4_java.java-J-F0--var-backend.exp
index 88ba78fe..88ba78fe 100644
--- a/test/cases/rlhc.d/case/scan4_java.java-J-F0--var-backend.exp
+++ b/test/rlhc.d/case/scan4_java.java-J-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_java.java-J-F0--var-backend.in b/test/rlhc.d/case/scan4_java.java-J-F0--var-backend.in
index 220a843a..220a843a 100644
--- a/test/cases/rlhc.d/case/scan4_java.java-J-F0--var-backend.in
+++ b/test/rlhc.d/case/scan4_java.java-J-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_java.java-J-F1--goto-backend.exp b/test/rlhc.d/case/scan4_java.java-J-F1--goto-backend.exp
index 9ddd0072..9ddd0072 100644
--- a/test/cases/rlhc.d/case/scan4_java.java-J-F1--goto-backend.exp
+++ b/test/rlhc.d/case/scan4_java.java-J-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_java.java-J-F1--goto-backend.in b/test/rlhc.d/case/scan4_java.java-J-F1--goto-backend.in
index 4b4ea47f..4b4ea47f 100644
--- a/test/cases/rlhc.d/case/scan4_java.java-J-F1--goto-backend.in
+++ b/test/rlhc.d/case/scan4_java.java-J-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_java.java-J-F1--var-backend.exp b/test/rlhc.d/case/scan4_java.java-J-F1--var-backend.exp
index 6e2ff46a..6e2ff46a 100644
--- a/test/cases/rlhc.d/case/scan4_java.java-J-F1--var-backend.exp
+++ b/test/rlhc.d/case/scan4_java.java-J-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_java.java-J-F1--var-backend.in b/test/rlhc.d/case/scan4_java.java-J-F1--var-backend.in
index ad765648..ad765648 100644
--- a/test/cases/rlhc.d/case/scan4_java.java-J-F1--var-backend.in
+++ b/test/rlhc.d/case/scan4_java.java-J-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_java.java-J-T0--goto-backend.exp b/test/rlhc.d/case/scan4_java.java-J-T0--goto-backend.exp
index ce85f076..ce85f076 100644
--- a/test/cases/rlhc.d/case/scan4_java.java-J-T0--goto-backend.exp
+++ b/test/rlhc.d/case/scan4_java.java-J-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_java.java-J-T0--goto-backend.in b/test/rlhc.d/case/scan4_java.java-J-T0--goto-backend.in
index 0fdf605c..0fdf605c 100644
--- a/test/cases/rlhc.d/case/scan4_java.java-J-T0--goto-backend.in
+++ b/test/rlhc.d/case/scan4_java.java-J-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_java.java-J-T0--var-backend.exp b/test/rlhc.d/case/scan4_java.java-J-T0--var-backend.exp
index a33da5f8..a33da5f8 100644
--- a/test/cases/rlhc.d/case/scan4_java.java-J-T0--var-backend.exp
+++ b/test/rlhc.d/case/scan4_java.java-J-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_java.java-J-T0--var-backend.in b/test/rlhc.d/case/scan4_java.java-J-T0--var-backend.in
index 8d91c4e5..8d91c4e5 100644
--- a/test/cases/rlhc.d/case/scan4_java.java-J-T0--var-backend.in
+++ b/test/rlhc.d/case/scan4_java.java-J-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_java.java-J-T1--goto-backend.exp b/test/rlhc.d/case/scan4_java.java-J-T1--goto-backend.exp
index 68b32c8c..68b32c8c 100644
--- a/test/cases/rlhc.d/case/scan4_java.java-J-T1--goto-backend.exp
+++ b/test/rlhc.d/case/scan4_java.java-J-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_java.java-J-T1--goto-backend.in b/test/rlhc.d/case/scan4_java.java-J-T1--goto-backend.in
index 7c1ed422..7c1ed422 100644
--- a/test/cases/rlhc.d/case/scan4_java.java-J-T1--goto-backend.in
+++ b/test/rlhc.d/case/scan4_java.java-J-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_java.java-J-T1--var-backend.exp b/test/rlhc.d/case/scan4_java.java-J-T1--var-backend.exp
index f55d140c..f55d140c 100644
--- a/test/cases/rlhc.d/case/scan4_java.java-J-T1--var-backend.exp
+++ b/test/rlhc.d/case/scan4_java.java-J-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_java.java-J-T1--var-backend.in b/test/rlhc.d/case/scan4_java.java-J-T1--var-backend.in
index 63211434..63211434 100644
--- a/test/cases/rlhc.d/case/scan4_java.java-J-T1--var-backend.in
+++ b/test/rlhc.d/case/scan4_java.java-J-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_julia.jl-Y-F0--var-backend.exp b/test/rlhc.d/case/scan4_julia.jl-Y-F0--var-backend.exp
index 26455793..26455793 100644
--- a/test/cases/rlhc.d/case/scan4_julia.jl-Y-F0--var-backend.exp
+++ b/test/rlhc.d/case/scan4_julia.jl-Y-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_julia.jl-Y-F0--var-backend.in b/test/rlhc.d/case/scan4_julia.jl-Y-F0--var-backend.in
index 8ff6025c..8ff6025c 100644
--- a/test/cases/rlhc.d/case/scan4_julia.jl-Y-F0--var-backend.in
+++ b/test/rlhc.d/case/scan4_julia.jl-Y-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_julia.jl-Y-F1--var-backend.exp b/test/rlhc.d/case/scan4_julia.jl-Y-F1--var-backend.exp
index 52dfa054..52dfa054 100644
--- a/test/cases/rlhc.d/case/scan4_julia.jl-Y-F1--var-backend.exp
+++ b/test/rlhc.d/case/scan4_julia.jl-Y-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_julia.jl-Y-F1--var-backend.in b/test/rlhc.d/case/scan4_julia.jl-Y-F1--var-backend.in
index 0e44e56d..0e44e56d 100644
--- a/test/cases/rlhc.d/case/scan4_julia.jl-Y-F1--var-backend.in
+++ b/test/rlhc.d/case/scan4_julia.jl-Y-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_julia.jl-Y-T0--var-backend.exp b/test/rlhc.d/case/scan4_julia.jl-Y-T0--var-backend.exp
index a2f1c24a..a2f1c24a 100644
--- a/test/cases/rlhc.d/case/scan4_julia.jl-Y-T0--var-backend.exp
+++ b/test/rlhc.d/case/scan4_julia.jl-Y-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_julia.jl-Y-T0--var-backend.in b/test/rlhc.d/case/scan4_julia.jl-Y-T0--var-backend.in
index 085f8149..085f8149 100644
--- a/test/cases/rlhc.d/case/scan4_julia.jl-Y-T0--var-backend.in
+++ b/test/rlhc.d/case/scan4_julia.jl-Y-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_julia.jl-Y-T1--var-backend.exp b/test/rlhc.d/case/scan4_julia.jl-Y-T1--var-backend.exp
index 0ce7f0dd..0ce7f0dd 100644
--- a/test/cases/rlhc.d/case/scan4_julia.jl-Y-T1--var-backend.exp
+++ b/test/rlhc.d/case/scan4_julia.jl-Y-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_julia.jl-Y-T1--var-backend.in b/test/rlhc.d/case/scan4_julia.jl-Y-T1--var-backend.in
index 2a1ef004..2a1ef004 100644
--- a/test/cases/rlhc.d/case/scan4_julia.jl-Y-T1--var-backend.in
+++ b/test/rlhc.d/case/scan4_julia.jl-Y-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_ocaml.ml-O-F0--var-backend.exp b/test/rlhc.d/case/scan4_ocaml.ml-O-F0--var-backend.exp
index 80dfc588..80dfc588 100644
--- a/test/cases/rlhc.d/case/scan4_ocaml.ml-O-F0--var-backend.exp
+++ b/test/rlhc.d/case/scan4_ocaml.ml-O-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_ocaml.ml-O-F0--var-backend.in b/test/rlhc.d/case/scan4_ocaml.ml-O-F0--var-backend.in
index 12bb4481..12bb4481 100644
--- a/test/cases/rlhc.d/case/scan4_ocaml.ml-O-F0--var-backend.in
+++ b/test/rlhc.d/case/scan4_ocaml.ml-O-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_ocaml.ml-O-F1--var-backend.exp b/test/rlhc.d/case/scan4_ocaml.ml-O-F1--var-backend.exp
index a6d0f27d..a6d0f27d 100644
--- a/test/cases/rlhc.d/case/scan4_ocaml.ml-O-F1--var-backend.exp
+++ b/test/rlhc.d/case/scan4_ocaml.ml-O-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_ocaml.ml-O-F1--var-backend.in b/test/rlhc.d/case/scan4_ocaml.ml-O-F1--var-backend.in
index 265c0440..265c0440 100644
--- a/test/cases/rlhc.d/case/scan4_ocaml.ml-O-F1--var-backend.in
+++ b/test/rlhc.d/case/scan4_ocaml.ml-O-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_ocaml.ml-O-T0--var-backend.exp b/test/rlhc.d/case/scan4_ocaml.ml-O-T0--var-backend.exp
index fd4b1329..fd4b1329 100644
--- a/test/cases/rlhc.d/case/scan4_ocaml.ml-O-T0--var-backend.exp
+++ b/test/rlhc.d/case/scan4_ocaml.ml-O-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_ocaml.ml-O-T0--var-backend.in b/test/rlhc.d/case/scan4_ocaml.ml-O-T0--var-backend.in
index 23ee1e9b..23ee1e9b 100644
--- a/test/cases/rlhc.d/case/scan4_ocaml.ml-O-T0--var-backend.in
+++ b/test/rlhc.d/case/scan4_ocaml.ml-O-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_ocaml.ml-O-T1--var-backend.exp b/test/rlhc.d/case/scan4_ocaml.ml-O-T1--var-backend.exp
index 495e2973..495e2973 100644
--- a/test/cases/rlhc.d/case/scan4_ocaml.ml-O-T1--var-backend.exp
+++ b/test/rlhc.d/case/scan4_ocaml.ml-O-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_ocaml.ml-O-T1--var-backend.in b/test/rlhc.d/case/scan4_ocaml.ml-O-T1--var-backend.in
index 2f947626..2f947626 100644
--- a/test/cases/rlhc.d/case/scan4_ocaml.ml-O-T1--var-backend.in
+++ b/test/rlhc.d/case/scan4_ocaml.ml-O-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_ruby.rb-R-F0--var-backend.exp b/test/rlhc.d/case/scan4_ruby.rb-R-F0--var-backend.exp
index 835d9c18..835d9c18 100644
--- a/test/cases/rlhc.d/case/scan4_ruby.rb-R-F0--var-backend.exp
+++ b/test/rlhc.d/case/scan4_ruby.rb-R-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_ruby.rb-R-F0--var-backend.in b/test/rlhc.d/case/scan4_ruby.rb-R-F0--var-backend.in
index 83ad271a..83ad271a 100644
--- a/test/cases/rlhc.d/case/scan4_ruby.rb-R-F0--var-backend.in
+++ b/test/rlhc.d/case/scan4_ruby.rb-R-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_ruby.rb-R-F1--var-backend.exp b/test/rlhc.d/case/scan4_ruby.rb-R-F1--var-backend.exp
index ac380ed7..ac380ed7 100644
--- a/test/cases/rlhc.d/case/scan4_ruby.rb-R-F1--var-backend.exp
+++ b/test/rlhc.d/case/scan4_ruby.rb-R-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_ruby.rb-R-F1--var-backend.in b/test/rlhc.d/case/scan4_ruby.rb-R-F1--var-backend.in
index a06aa9e9..a06aa9e9 100644
--- a/test/cases/rlhc.d/case/scan4_ruby.rb-R-F1--var-backend.in
+++ b/test/rlhc.d/case/scan4_ruby.rb-R-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_ruby.rb-R-T0--var-backend.exp b/test/rlhc.d/case/scan4_ruby.rb-R-T0--var-backend.exp
index d8c56801..d8c56801 100644
--- a/test/cases/rlhc.d/case/scan4_ruby.rb-R-T0--var-backend.exp
+++ b/test/rlhc.d/case/scan4_ruby.rb-R-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_ruby.rb-R-T0--var-backend.in b/test/rlhc.d/case/scan4_ruby.rb-R-T0--var-backend.in
index 31f87c09..31f87c09 100644
--- a/test/cases/rlhc.d/case/scan4_ruby.rb-R-T0--var-backend.in
+++ b/test/rlhc.d/case/scan4_ruby.rb-R-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_ruby.rb-R-T1--var-backend.exp b/test/rlhc.d/case/scan4_ruby.rb-R-T1--var-backend.exp
index e3e289df..e3e289df 100644
--- a/test/cases/rlhc.d/case/scan4_ruby.rb-R-T1--var-backend.exp
+++ b/test/rlhc.d/case/scan4_ruby.rb-R-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_ruby.rb-R-T1--var-backend.in b/test/rlhc.d/case/scan4_ruby.rb-R-T1--var-backend.in
index 6c8df86c..6c8df86c 100644
--- a/test/cases/rlhc.d/case/scan4_ruby.rb-R-T1--var-backend.in
+++ b/test/rlhc.d/case/scan4_ruby.rb-R-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_rust.rs-U-F0--var-backend.exp b/test/rlhc.d/case/scan4_rust.rs-U-F0--var-backend.exp
index 1dd69ebb..1dd69ebb 100644
--- a/test/cases/rlhc.d/case/scan4_rust.rs-U-F0--var-backend.exp
+++ b/test/rlhc.d/case/scan4_rust.rs-U-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_rust.rs-U-F0--var-backend.in b/test/rlhc.d/case/scan4_rust.rs-U-F0--var-backend.in
index 92ba7675..92ba7675 100644
--- a/test/cases/rlhc.d/case/scan4_rust.rs-U-F0--var-backend.in
+++ b/test/rlhc.d/case/scan4_rust.rs-U-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_rust.rs-U-F1--var-backend.exp b/test/rlhc.d/case/scan4_rust.rs-U-F1--var-backend.exp
index 08a27107..08a27107 100644
--- a/test/cases/rlhc.d/case/scan4_rust.rs-U-F1--var-backend.exp
+++ b/test/rlhc.d/case/scan4_rust.rs-U-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_rust.rs-U-F1--var-backend.in b/test/rlhc.d/case/scan4_rust.rs-U-F1--var-backend.in
index 71dbe240..71dbe240 100644
--- a/test/cases/rlhc.d/case/scan4_rust.rs-U-F1--var-backend.in
+++ b/test/rlhc.d/case/scan4_rust.rs-U-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_rust.rs-U-T0--var-backend.exp b/test/rlhc.d/case/scan4_rust.rs-U-T0--var-backend.exp
index cc6ec508..cc6ec508 100644
--- a/test/cases/rlhc.d/case/scan4_rust.rs-U-T0--var-backend.exp
+++ b/test/rlhc.d/case/scan4_rust.rs-U-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_rust.rs-U-T0--var-backend.in b/test/rlhc.d/case/scan4_rust.rs-U-T0--var-backend.in
index 72f31408..72f31408 100644
--- a/test/cases/rlhc.d/case/scan4_rust.rs-U-T0--var-backend.in
+++ b/test/rlhc.d/case/scan4_rust.rs-U-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan4_rust.rs-U-T1--var-backend.exp b/test/rlhc.d/case/scan4_rust.rs-U-T1--var-backend.exp
index e6bca493..e6bca493 100644
--- a/test/cases/rlhc.d/case/scan4_rust.rs-U-T1--var-backend.exp
+++ b/test/rlhc.d/case/scan4_rust.rs-U-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan4_rust.rs-U-T1--var-backend.in b/test/rlhc.d/case/scan4_rust.rs-U-T1--var-backend.in
index 32a01d7d..32a01d7d 100644
--- a/test/cases/rlhc.d/case/scan4_rust.rs-U-T1--var-backend.in
+++ b/test/rlhc.d/case/scan4_rust.rs-U-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan5.ml-O-F0--var-backend.exp b/test/rlhc.d/case/scan5.ml-O-F0--var-backend.exp
index 1b547236..1b547236 100644
--- a/test/cases/rlhc.d/case/scan5.ml-O-F0--var-backend.exp
+++ b/test/rlhc.d/case/scan5.ml-O-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan5.ml-O-F0--var-backend.in b/test/rlhc.d/case/scan5.ml-O-F0--var-backend.in
index 19e0c8e9..19e0c8e9 100644
--- a/test/cases/rlhc.d/case/scan5.ml-O-F0--var-backend.in
+++ b/test/rlhc.d/case/scan5.ml-O-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan5.ml-O-F1--var-backend.exp b/test/rlhc.d/case/scan5.ml-O-F1--var-backend.exp
index 7356675a..7356675a 100644
--- a/test/cases/rlhc.d/case/scan5.ml-O-F1--var-backend.exp
+++ b/test/rlhc.d/case/scan5.ml-O-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan5.ml-O-F1--var-backend.in b/test/rlhc.d/case/scan5.ml-O-F1--var-backend.in
index 2d3d3545..2d3d3545 100644
--- a/test/cases/rlhc.d/case/scan5.ml-O-F1--var-backend.in
+++ b/test/rlhc.d/case/scan5.ml-O-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan5.ml-O-T0--var-backend.exp b/test/rlhc.d/case/scan5.ml-O-T0--var-backend.exp
index d0021a37..d0021a37 100644
--- a/test/cases/rlhc.d/case/scan5.ml-O-T0--var-backend.exp
+++ b/test/rlhc.d/case/scan5.ml-O-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan5.ml-O-T0--var-backend.in b/test/rlhc.d/case/scan5.ml-O-T0--var-backend.in
index 22846797..22846797 100644
--- a/test/cases/rlhc.d/case/scan5.ml-O-T0--var-backend.in
+++ b/test/rlhc.d/case/scan5.ml-O-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan5.ml-O-T1--var-backend.exp b/test/rlhc.d/case/scan5.ml-O-T1--var-backend.exp
index 48b40a75..48b40a75 100644
--- a/test/cases/rlhc.d/case/scan5.ml-O-T1--var-backend.exp
+++ b/test/rlhc.d/case/scan5.ml-O-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan5.ml-O-T1--var-backend.in b/test/rlhc.d/case/scan5.ml-O-T1--var-backend.in
index e4bc88fc..e4bc88fc 100644
--- a/test/cases/rlhc.d/case/scan5.ml-O-T1--var-backend.in
+++ b/test/rlhc.d/case/scan5.ml-O-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan6.ml-O-F0--var-backend.exp b/test/rlhc.d/case/scan6.ml-O-F0--var-backend.exp
index c204a86b..c204a86b 100644
--- a/test/cases/rlhc.d/case/scan6.ml-O-F0--var-backend.exp
+++ b/test/rlhc.d/case/scan6.ml-O-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan6.ml-O-F0--var-backend.in b/test/rlhc.d/case/scan6.ml-O-F0--var-backend.in
index a7b94cc6..a7b94cc6 100644
--- a/test/cases/rlhc.d/case/scan6.ml-O-F0--var-backend.in
+++ b/test/rlhc.d/case/scan6.ml-O-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan6.ml-O-F1--var-backend.exp b/test/rlhc.d/case/scan6.ml-O-F1--var-backend.exp
index 73244d1d..73244d1d 100644
--- a/test/cases/rlhc.d/case/scan6.ml-O-F1--var-backend.exp
+++ b/test/rlhc.d/case/scan6.ml-O-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan6.ml-O-F1--var-backend.in b/test/rlhc.d/case/scan6.ml-O-F1--var-backend.in
index 17eaa6d0..17eaa6d0 100644
--- a/test/cases/rlhc.d/case/scan6.ml-O-F1--var-backend.in
+++ b/test/rlhc.d/case/scan6.ml-O-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan6.ml-O-T0--var-backend.exp b/test/rlhc.d/case/scan6.ml-O-T0--var-backend.exp
index f6115e46..f6115e46 100644
--- a/test/cases/rlhc.d/case/scan6.ml-O-T0--var-backend.exp
+++ b/test/rlhc.d/case/scan6.ml-O-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan6.ml-O-T0--var-backend.in b/test/rlhc.d/case/scan6.ml-O-T0--var-backend.in
index 96cb8aa4..96cb8aa4 100644
--- a/test/cases/rlhc.d/case/scan6.ml-O-T0--var-backend.in
+++ b/test/rlhc.d/case/scan6.ml-O-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/scan6.ml-O-T1--var-backend.exp b/test/rlhc.d/case/scan6.ml-O-T1--var-backend.exp
index d2d15987..d2d15987 100644
--- a/test/cases/rlhc.d/case/scan6.ml-O-T1--var-backend.exp
+++ b/test/rlhc.d/case/scan6.ml-O-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/scan6.ml-O-T1--var-backend.in b/test/rlhc.d/case/scan6.ml-O-T1--var-backend.in
index 0eefbabb..0eefbabb 100644
--- a/test/cases/rlhc.d/case/scan6.ml-O-T1--var-backend.in
+++ b/test/rlhc.d/case/scan6.ml-O-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_c.c-C-F0--goto-backend.exp b/test/rlhc.d/case/stateact1_c.c-C-F0--goto-backend.exp
index 90fe86cf..90fe86cf 100644
--- a/test/cases/rlhc.d/case/stateact1_c.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/stateact1_c.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_c.c-C-F0--goto-backend.in b/test/rlhc.d/case/stateact1_c.c-C-F0--goto-backend.in
index 0c53db1a..0c53db1a 100644
--- a/test/cases/rlhc.d/case/stateact1_c.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/stateact1_c.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_c.c-C-F0--var-backend.exp b/test/rlhc.d/case/stateact1_c.c-C-F0--var-backend.exp
index 8db38390..8db38390 100644
--- a/test/cases/rlhc.d/case/stateact1_c.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/stateact1_c.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_c.c-C-F0--var-backend.in b/test/rlhc.d/case/stateact1_c.c-C-F0--var-backend.in
index 78e739c7..78e739c7 100644
--- a/test/cases/rlhc.d/case/stateact1_c.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/stateact1_c.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_c.c-C-F1--goto-backend.exp b/test/rlhc.d/case/stateact1_c.c-C-F1--goto-backend.exp
index 48172568..48172568 100644
--- a/test/cases/rlhc.d/case/stateact1_c.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/stateact1_c.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_c.c-C-F1--goto-backend.in b/test/rlhc.d/case/stateact1_c.c-C-F1--goto-backend.in
index aa8bdb05..aa8bdb05 100644
--- a/test/cases/rlhc.d/case/stateact1_c.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/stateact1_c.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_c.c-C-F1--var-backend.exp b/test/rlhc.d/case/stateact1_c.c-C-F1--var-backend.exp
index 24a407db..24a407db 100644
--- a/test/cases/rlhc.d/case/stateact1_c.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/stateact1_c.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_c.c-C-F1--var-backend.in b/test/rlhc.d/case/stateact1_c.c-C-F1--var-backend.in
index 80afd620..80afd620 100644
--- a/test/cases/rlhc.d/case/stateact1_c.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/stateact1_c.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_c.c-C-G0--goto-backend.exp b/test/rlhc.d/case/stateact1_c.c-C-G0--goto-backend.exp
index b6db1632..b6db1632 100644
--- a/test/cases/rlhc.d/case/stateact1_c.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/stateact1_c.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_c.c-C-G0--goto-backend.in b/test/rlhc.d/case/stateact1_c.c-C-G0--goto-backend.in
index 6100135a..6100135a 100644
--- a/test/cases/rlhc.d/case/stateact1_c.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/stateact1_c.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_c.c-C-G1--goto-backend.exp b/test/rlhc.d/case/stateact1_c.c-C-G1--goto-backend.exp
index 1f988c23..1f988c23 100644
--- a/test/cases/rlhc.d/case/stateact1_c.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/stateact1_c.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_c.c-C-G1--goto-backend.in b/test/rlhc.d/case/stateact1_c.c-C-G1--goto-backend.in
index 5594184a..5594184a 100644
--- a/test/cases/rlhc.d/case/stateact1_c.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/stateact1_c.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_c.c-C-G2--goto-backend.exp b/test/rlhc.d/case/stateact1_c.c-C-G2--goto-backend.exp
index 2176cd73..2176cd73 100644
--- a/test/cases/rlhc.d/case/stateact1_c.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/stateact1_c.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_c.c-C-G2--goto-backend.in b/test/rlhc.d/case/stateact1_c.c-C-G2--goto-backend.in
index 1ac5f06a..1ac5f06a 100644
--- a/test/cases/rlhc.d/case/stateact1_c.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/stateact1_c.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_c.c-C-T0--goto-backend.exp b/test/rlhc.d/case/stateact1_c.c-C-T0--goto-backend.exp
index d9be3f42..d9be3f42 100644
--- a/test/cases/rlhc.d/case/stateact1_c.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/stateact1_c.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_c.c-C-T0--goto-backend.in b/test/rlhc.d/case/stateact1_c.c-C-T0--goto-backend.in
index 9a10b582..9a10b582 100644
--- a/test/cases/rlhc.d/case/stateact1_c.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/stateact1_c.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_c.c-C-T0--var-backend.exp b/test/rlhc.d/case/stateact1_c.c-C-T0--var-backend.exp
index 596ab3d6..596ab3d6 100644
--- a/test/cases/rlhc.d/case/stateact1_c.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/stateact1_c.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_c.c-C-T0--var-backend.in b/test/rlhc.d/case/stateact1_c.c-C-T0--var-backend.in
index 53cc32a5..53cc32a5 100644
--- a/test/cases/rlhc.d/case/stateact1_c.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/stateact1_c.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_c.c-C-T1--goto-backend.exp b/test/rlhc.d/case/stateact1_c.c-C-T1--goto-backend.exp
index d2834a58..d2834a58 100644
--- a/test/cases/rlhc.d/case/stateact1_c.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/stateact1_c.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_c.c-C-T1--goto-backend.in b/test/rlhc.d/case/stateact1_c.c-C-T1--goto-backend.in
index dfd44477..dfd44477 100644
--- a/test/cases/rlhc.d/case/stateact1_c.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/stateact1_c.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_c.c-C-T1--var-backend.exp b/test/rlhc.d/case/stateact1_c.c-C-T1--var-backend.exp
index 1e1c65ae..1e1c65ae 100644
--- a/test/cases/rlhc.d/case/stateact1_c.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/stateact1_c.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_c.c-C-T1--var-backend.in b/test/rlhc.d/case/stateact1_c.c-C-T1--var-backend.in
index 7aac3f88..7aac3f88 100644
--- a/test/cases/rlhc.d/case/stateact1_c.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/stateact1_c.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_crack.crk-K-F0--var-backend.exp b/test/rlhc.d/case/stateact1_crack.crk-K-F0--var-backend.exp
index fcd3869d..fcd3869d 100644
--- a/test/cases/rlhc.d/case/stateact1_crack.crk-K-F0--var-backend.exp
+++ b/test/rlhc.d/case/stateact1_crack.crk-K-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_crack.crk-K-F0--var-backend.in b/test/rlhc.d/case/stateact1_crack.crk-K-F0--var-backend.in
index 2dd95a92..2dd95a92 100644
--- a/test/cases/rlhc.d/case/stateact1_crack.crk-K-F0--var-backend.in
+++ b/test/rlhc.d/case/stateact1_crack.crk-K-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_crack.crk-K-F1--var-backend.exp b/test/rlhc.d/case/stateact1_crack.crk-K-F1--var-backend.exp
index b09b5c65..b09b5c65 100644
--- a/test/cases/rlhc.d/case/stateact1_crack.crk-K-F1--var-backend.exp
+++ b/test/rlhc.d/case/stateact1_crack.crk-K-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_crack.crk-K-F1--var-backend.in b/test/rlhc.d/case/stateact1_crack.crk-K-F1--var-backend.in
index 6d8c5fd4..6d8c5fd4 100644
--- a/test/cases/rlhc.d/case/stateact1_crack.crk-K-F1--var-backend.in
+++ b/test/rlhc.d/case/stateact1_crack.crk-K-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_crack.crk-K-T0--var-backend.exp b/test/rlhc.d/case/stateact1_crack.crk-K-T0--var-backend.exp
index a081fbee..a081fbee 100644
--- a/test/cases/rlhc.d/case/stateact1_crack.crk-K-T0--var-backend.exp
+++ b/test/rlhc.d/case/stateact1_crack.crk-K-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_crack.crk-K-T0--var-backend.in b/test/rlhc.d/case/stateact1_crack.crk-K-T0--var-backend.in
index c83a9e6d..c83a9e6d 100644
--- a/test/cases/rlhc.d/case/stateact1_crack.crk-K-T0--var-backend.in
+++ b/test/rlhc.d/case/stateact1_crack.crk-K-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_crack.crk-K-T1--var-backend.exp b/test/rlhc.d/case/stateact1_crack.crk-K-T1--var-backend.exp
index 0438d9eb..0438d9eb 100644
--- a/test/cases/rlhc.d/case/stateact1_crack.crk-K-T1--var-backend.exp
+++ b/test/rlhc.d/case/stateact1_crack.crk-K-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_crack.crk-K-T1--var-backend.in b/test/rlhc.d/case/stateact1_crack.crk-K-T1--var-backend.in
index 433601ea..433601ea 100644
--- a/test/cases/rlhc.d/case/stateact1_crack.crk-K-T1--var-backend.in
+++ b/test/rlhc.d/case/stateact1_crack.crk-K-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_cs.cs-A-F0--goto-backend.exp b/test/rlhc.d/case/stateact1_cs.cs-A-F0--goto-backend.exp
index 01f68f4c..01f68f4c 100644
--- a/test/cases/rlhc.d/case/stateact1_cs.cs-A-F0--goto-backend.exp
+++ b/test/rlhc.d/case/stateact1_cs.cs-A-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_cs.cs-A-F0--goto-backend.in b/test/rlhc.d/case/stateact1_cs.cs-A-F0--goto-backend.in
index 723ea3e2..723ea3e2 100644
--- a/test/cases/rlhc.d/case/stateact1_cs.cs-A-F0--goto-backend.in
+++ b/test/rlhc.d/case/stateact1_cs.cs-A-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_cs.cs-A-F0--var-backend.exp b/test/rlhc.d/case/stateact1_cs.cs-A-F0--var-backend.exp
index 7957630f..7957630f 100644
--- a/test/cases/rlhc.d/case/stateact1_cs.cs-A-F0--var-backend.exp
+++ b/test/rlhc.d/case/stateact1_cs.cs-A-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_cs.cs-A-F0--var-backend.in b/test/rlhc.d/case/stateact1_cs.cs-A-F0--var-backend.in
index 692aea16..692aea16 100644
--- a/test/cases/rlhc.d/case/stateact1_cs.cs-A-F0--var-backend.in
+++ b/test/rlhc.d/case/stateact1_cs.cs-A-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_cs.cs-A-F1--goto-backend.exp b/test/rlhc.d/case/stateact1_cs.cs-A-F1--goto-backend.exp
index c244854c..c244854c 100644
--- a/test/cases/rlhc.d/case/stateact1_cs.cs-A-F1--goto-backend.exp
+++ b/test/rlhc.d/case/stateact1_cs.cs-A-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_cs.cs-A-F1--goto-backend.in b/test/rlhc.d/case/stateact1_cs.cs-A-F1--goto-backend.in
index 134b4837..134b4837 100644
--- a/test/cases/rlhc.d/case/stateact1_cs.cs-A-F1--goto-backend.in
+++ b/test/rlhc.d/case/stateact1_cs.cs-A-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_cs.cs-A-F1--var-backend.exp b/test/rlhc.d/case/stateact1_cs.cs-A-F1--var-backend.exp
index 5c3d7bc9..5c3d7bc9 100644
--- a/test/cases/rlhc.d/case/stateact1_cs.cs-A-F1--var-backend.exp
+++ b/test/rlhc.d/case/stateact1_cs.cs-A-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_cs.cs-A-F1--var-backend.in b/test/rlhc.d/case/stateact1_cs.cs-A-F1--var-backend.in
index eaa9ba4f..eaa9ba4f 100644
--- a/test/cases/rlhc.d/case/stateact1_cs.cs-A-F1--var-backend.in
+++ b/test/rlhc.d/case/stateact1_cs.cs-A-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_cs.cs-A-G0--goto-backend.exp b/test/rlhc.d/case/stateact1_cs.cs-A-G0--goto-backend.exp
index eabaa7ca..eabaa7ca 100644
--- a/test/cases/rlhc.d/case/stateact1_cs.cs-A-G0--goto-backend.exp
+++ b/test/rlhc.d/case/stateact1_cs.cs-A-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_cs.cs-A-G0--goto-backend.in b/test/rlhc.d/case/stateact1_cs.cs-A-G0--goto-backend.in
index d63c81d0..d63c81d0 100644
--- a/test/cases/rlhc.d/case/stateact1_cs.cs-A-G0--goto-backend.in
+++ b/test/rlhc.d/case/stateact1_cs.cs-A-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_cs.cs-A-G1--goto-backend.exp b/test/rlhc.d/case/stateact1_cs.cs-A-G1--goto-backend.exp
index af43b2e4..af43b2e4 100644
--- a/test/cases/rlhc.d/case/stateact1_cs.cs-A-G1--goto-backend.exp
+++ b/test/rlhc.d/case/stateact1_cs.cs-A-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_cs.cs-A-G1--goto-backend.in b/test/rlhc.d/case/stateact1_cs.cs-A-G1--goto-backend.in
index 8a68de89..8a68de89 100644
--- a/test/cases/rlhc.d/case/stateact1_cs.cs-A-G1--goto-backend.in
+++ b/test/rlhc.d/case/stateact1_cs.cs-A-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_cs.cs-A-T0--goto-backend.exp b/test/rlhc.d/case/stateact1_cs.cs-A-T0--goto-backend.exp
index 94a4ee69..94a4ee69 100644
--- a/test/cases/rlhc.d/case/stateact1_cs.cs-A-T0--goto-backend.exp
+++ b/test/rlhc.d/case/stateact1_cs.cs-A-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_cs.cs-A-T0--goto-backend.in b/test/rlhc.d/case/stateact1_cs.cs-A-T0--goto-backend.in
index 6b25b4aa..6b25b4aa 100644
--- a/test/cases/rlhc.d/case/stateact1_cs.cs-A-T0--goto-backend.in
+++ b/test/rlhc.d/case/stateact1_cs.cs-A-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_cs.cs-A-T0--var-backend.exp b/test/rlhc.d/case/stateact1_cs.cs-A-T0--var-backend.exp
index 53f9c732..53f9c732 100644
--- a/test/cases/rlhc.d/case/stateact1_cs.cs-A-T0--var-backend.exp
+++ b/test/rlhc.d/case/stateact1_cs.cs-A-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_cs.cs-A-T0--var-backend.in b/test/rlhc.d/case/stateact1_cs.cs-A-T0--var-backend.in
index 5322f792..5322f792 100644
--- a/test/cases/rlhc.d/case/stateact1_cs.cs-A-T0--var-backend.in
+++ b/test/rlhc.d/case/stateact1_cs.cs-A-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_cs.cs-A-T1--goto-backend.exp b/test/rlhc.d/case/stateact1_cs.cs-A-T1--goto-backend.exp
index 125496d6..125496d6 100644
--- a/test/cases/rlhc.d/case/stateact1_cs.cs-A-T1--goto-backend.exp
+++ b/test/rlhc.d/case/stateact1_cs.cs-A-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_cs.cs-A-T1--goto-backend.in b/test/rlhc.d/case/stateact1_cs.cs-A-T1--goto-backend.in
index 07eabbaa..07eabbaa 100644
--- a/test/cases/rlhc.d/case/stateact1_cs.cs-A-T1--goto-backend.in
+++ b/test/rlhc.d/case/stateact1_cs.cs-A-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_cs.cs-A-T1--var-backend.exp b/test/rlhc.d/case/stateact1_cs.cs-A-T1--var-backend.exp
index 390d8d8f..390d8d8f 100644
--- a/test/cases/rlhc.d/case/stateact1_cs.cs-A-T1--var-backend.exp
+++ b/test/rlhc.d/case/stateact1_cs.cs-A-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_cs.cs-A-T1--var-backend.in b/test/rlhc.d/case/stateact1_cs.cs-A-T1--var-backend.in
index 265a1cb3..265a1cb3 100644
--- a/test/cases/rlhc.d/case/stateact1_cs.cs-A-T1--var-backend.in
+++ b/test/rlhc.d/case/stateact1_cs.cs-A-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_go.go-Z-F0--goto-backend.exp b/test/rlhc.d/case/stateact1_go.go-Z-F0--goto-backend.exp
index b2d1951c..b2d1951c 100644
--- a/test/cases/rlhc.d/case/stateact1_go.go-Z-F0--goto-backend.exp
+++ b/test/rlhc.d/case/stateact1_go.go-Z-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_go.go-Z-F0--goto-backend.in b/test/rlhc.d/case/stateact1_go.go-Z-F0--goto-backend.in
index 4cdb867b..4cdb867b 100644
--- a/test/cases/rlhc.d/case/stateact1_go.go-Z-F0--goto-backend.in
+++ b/test/rlhc.d/case/stateact1_go.go-Z-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_go.go-Z-F0--var-backend.exp b/test/rlhc.d/case/stateact1_go.go-Z-F0--var-backend.exp
index d549ecbb..d549ecbb 100644
--- a/test/cases/rlhc.d/case/stateact1_go.go-Z-F0--var-backend.exp
+++ b/test/rlhc.d/case/stateact1_go.go-Z-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_go.go-Z-F0--var-backend.in b/test/rlhc.d/case/stateact1_go.go-Z-F0--var-backend.in
index 5d782c3b..5d782c3b 100644
--- a/test/cases/rlhc.d/case/stateact1_go.go-Z-F0--var-backend.in
+++ b/test/rlhc.d/case/stateact1_go.go-Z-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_go.go-Z-F1--goto-backend.exp b/test/rlhc.d/case/stateact1_go.go-Z-F1--goto-backend.exp
index 255911a6..255911a6 100644
--- a/test/cases/rlhc.d/case/stateact1_go.go-Z-F1--goto-backend.exp
+++ b/test/rlhc.d/case/stateact1_go.go-Z-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_go.go-Z-F1--goto-backend.in b/test/rlhc.d/case/stateact1_go.go-Z-F1--goto-backend.in
index ec0aa057..ec0aa057 100644
--- a/test/cases/rlhc.d/case/stateact1_go.go-Z-F1--goto-backend.in
+++ b/test/rlhc.d/case/stateact1_go.go-Z-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_go.go-Z-F1--var-backend.exp b/test/rlhc.d/case/stateact1_go.go-Z-F1--var-backend.exp
index c16c1227..c16c1227 100644
--- a/test/cases/rlhc.d/case/stateact1_go.go-Z-F1--var-backend.exp
+++ b/test/rlhc.d/case/stateact1_go.go-Z-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_go.go-Z-F1--var-backend.in b/test/rlhc.d/case/stateact1_go.go-Z-F1--var-backend.in
index e24928f9..e24928f9 100644
--- a/test/cases/rlhc.d/case/stateact1_go.go-Z-F1--var-backend.in
+++ b/test/rlhc.d/case/stateact1_go.go-Z-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_go.go-Z-G0--goto-backend.exp b/test/rlhc.d/case/stateact1_go.go-Z-G0--goto-backend.exp
index 82eb0f19..82eb0f19 100644
--- a/test/cases/rlhc.d/case/stateact1_go.go-Z-G0--goto-backend.exp
+++ b/test/rlhc.d/case/stateact1_go.go-Z-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_go.go-Z-G0--goto-backend.in b/test/rlhc.d/case/stateact1_go.go-Z-G0--goto-backend.in
index 3b9fa172..3b9fa172 100644
--- a/test/cases/rlhc.d/case/stateact1_go.go-Z-G0--goto-backend.in
+++ b/test/rlhc.d/case/stateact1_go.go-Z-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_go.go-Z-G1--goto-backend.exp b/test/rlhc.d/case/stateact1_go.go-Z-G1--goto-backend.exp
index dd4030d7..dd4030d7 100644
--- a/test/cases/rlhc.d/case/stateact1_go.go-Z-G1--goto-backend.exp
+++ b/test/rlhc.d/case/stateact1_go.go-Z-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_go.go-Z-G1--goto-backend.in b/test/rlhc.d/case/stateact1_go.go-Z-G1--goto-backend.in
index 6275443c..6275443c 100644
--- a/test/cases/rlhc.d/case/stateact1_go.go-Z-G1--goto-backend.in
+++ b/test/rlhc.d/case/stateact1_go.go-Z-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_go.go-Z-G2--goto-backend.exp b/test/rlhc.d/case/stateact1_go.go-Z-G2--goto-backend.exp
index 68c271f0..68c271f0 100644
--- a/test/cases/rlhc.d/case/stateact1_go.go-Z-G2--goto-backend.exp
+++ b/test/rlhc.d/case/stateact1_go.go-Z-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_go.go-Z-G2--goto-backend.in b/test/rlhc.d/case/stateact1_go.go-Z-G2--goto-backend.in
index ccd13c9d..ccd13c9d 100644
--- a/test/cases/rlhc.d/case/stateact1_go.go-Z-G2--goto-backend.in
+++ b/test/rlhc.d/case/stateact1_go.go-Z-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_go.go-Z-T0--goto-backend.exp b/test/rlhc.d/case/stateact1_go.go-Z-T0--goto-backend.exp
index 5b67f188..5b67f188 100644
--- a/test/cases/rlhc.d/case/stateact1_go.go-Z-T0--goto-backend.exp
+++ b/test/rlhc.d/case/stateact1_go.go-Z-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_go.go-Z-T0--goto-backend.in b/test/rlhc.d/case/stateact1_go.go-Z-T0--goto-backend.in
index ead8ab5b..ead8ab5b 100644
--- a/test/cases/rlhc.d/case/stateact1_go.go-Z-T0--goto-backend.in
+++ b/test/rlhc.d/case/stateact1_go.go-Z-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_go.go-Z-T0--var-backend.exp b/test/rlhc.d/case/stateact1_go.go-Z-T0--var-backend.exp
index d65b8769..d65b8769 100644
--- a/test/cases/rlhc.d/case/stateact1_go.go-Z-T0--var-backend.exp
+++ b/test/rlhc.d/case/stateact1_go.go-Z-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_go.go-Z-T0--var-backend.in b/test/rlhc.d/case/stateact1_go.go-Z-T0--var-backend.in
index 4d449f5b..4d449f5b 100644
--- a/test/cases/rlhc.d/case/stateact1_go.go-Z-T0--var-backend.in
+++ b/test/rlhc.d/case/stateact1_go.go-Z-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_go.go-Z-T1--goto-backend.exp b/test/rlhc.d/case/stateact1_go.go-Z-T1--goto-backend.exp
index 367ec866..367ec866 100644
--- a/test/cases/rlhc.d/case/stateact1_go.go-Z-T1--goto-backend.exp
+++ b/test/rlhc.d/case/stateact1_go.go-Z-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_go.go-Z-T1--goto-backend.in b/test/rlhc.d/case/stateact1_go.go-Z-T1--goto-backend.in
index 43c8781e..43c8781e 100644
--- a/test/cases/rlhc.d/case/stateact1_go.go-Z-T1--goto-backend.in
+++ b/test/rlhc.d/case/stateact1_go.go-Z-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_go.go-Z-T1--var-backend.exp b/test/rlhc.d/case/stateact1_go.go-Z-T1--var-backend.exp
index a024c132..a024c132 100644
--- a/test/cases/rlhc.d/case/stateact1_go.go-Z-T1--var-backend.exp
+++ b/test/rlhc.d/case/stateact1_go.go-Z-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_go.go-Z-T1--var-backend.in b/test/rlhc.d/case/stateact1_go.go-Z-T1--var-backend.in
index 5913ad0b..5913ad0b 100644
--- a/test/cases/rlhc.d/case/stateact1_go.go-Z-T1--var-backend.in
+++ b/test/rlhc.d/case/stateact1_go.go-Z-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_java.java-J-F0--goto-backend.exp b/test/rlhc.d/case/stateact1_java.java-J-F0--goto-backend.exp
index 4d8e0d4e..4d8e0d4e 100644
--- a/test/cases/rlhc.d/case/stateact1_java.java-J-F0--goto-backend.exp
+++ b/test/rlhc.d/case/stateact1_java.java-J-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_java.java-J-F0--goto-backend.in b/test/rlhc.d/case/stateact1_java.java-J-F0--goto-backend.in
index 2792005a..2792005a 100644
--- a/test/cases/rlhc.d/case/stateact1_java.java-J-F0--goto-backend.in
+++ b/test/rlhc.d/case/stateact1_java.java-J-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_java.java-J-F0--var-backend.exp b/test/rlhc.d/case/stateact1_java.java-J-F0--var-backend.exp
index ada039a1..ada039a1 100644
--- a/test/cases/rlhc.d/case/stateact1_java.java-J-F0--var-backend.exp
+++ b/test/rlhc.d/case/stateact1_java.java-J-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_java.java-J-F0--var-backend.in b/test/rlhc.d/case/stateact1_java.java-J-F0--var-backend.in
index 72eec487..72eec487 100644
--- a/test/cases/rlhc.d/case/stateact1_java.java-J-F0--var-backend.in
+++ b/test/rlhc.d/case/stateact1_java.java-J-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_java.java-J-F1--goto-backend.exp b/test/rlhc.d/case/stateact1_java.java-J-F1--goto-backend.exp
index c1238c86..c1238c86 100644
--- a/test/cases/rlhc.d/case/stateact1_java.java-J-F1--goto-backend.exp
+++ b/test/rlhc.d/case/stateact1_java.java-J-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_java.java-J-F1--goto-backend.in b/test/rlhc.d/case/stateact1_java.java-J-F1--goto-backend.in
index 598c9c05..598c9c05 100644
--- a/test/cases/rlhc.d/case/stateact1_java.java-J-F1--goto-backend.in
+++ b/test/rlhc.d/case/stateact1_java.java-J-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_java.java-J-F1--var-backend.exp b/test/rlhc.d/case/stateact1_java.java-J-F1--var-backend.exp
index 543ff70d..543ff70d 100644
--- a/test/cases/rlhc.d/case/stateact1_java.java-J-F1--var-backend.exp
+++ b/test/rlhc.d/case/stateact1_java.java-J-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_java.java-J-F1--var-backend.in b/test/rlhc.d/case/stateact1_java.java-J-F1--var-backend.in
index 5d08506a..5d08506a 100644
--- a/test/cases/rlhc.d/case/stateact1_java.java-J-F1--var-backend.in
+++ b/test/rlhc.d/case/stateact1_java.java-J-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_java.java-J-T0--goto-backend.exp b/test/rlhc.d/case/stateact1_java.java-J-T0--goto-backend.exp
index 9dc3165e..9dc3165e 100644
--- a/test/cases/rlhc.d/case/stateact1_java.java-J-T0--goto-backend.exp
+++ b/test/rlhc.d/case/stateact1_java.java-J-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_java.java-J-T0--goto-backend.in b/test/rlhc.d/case/stateact1_java.java-J-T0--goto-backend.in
index 6789cb7f..6789cb7f 100644
--- a/test/cases/rlhc.d/case/stateact1_java.java-J-T0--goto-backend.in
+++ b/test/rlhc.d/case/stateact1_java.java-J-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_java.java-J-T0--var-backend.exp b/test/rlhc.d/case/stateact1_java.java-J-T0--var-backend.exp
index 50022bbd..50022bbd 100644
--- a/test/cases/rlhc.d/case/stateact1_java.java-J-T0--var-backend.exp
+++ b/test/rlhc.d/case/stateact1_java.java-J-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_java.java-J-T0--var-backend.in b/test/rlhc.d/case/stateact1_java.java-J-T0--var-backend.in
index d6f56483..d6f56483 100644
--- a/test/cases/rlhc.d/case/stateact1_java.java-J-T0--var-backend.in
+++ b/test/rlhc.d/case/stateact1_java.java-J-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_java.java-J-T1--goto-backend.exp b/test/rlhc.d/case/stateact1_java.java-J-T1--goto-backend.exp
index 916ac554..916ac554 100644
--- a/test/cases/rlhc.d/case/stateact1_java.java-J-T1--goto-backend.exp
+++ b/test/rlhc.d/case/stateact1_java.java-J-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_java.java-J-T1--goto-backend.in b/test/rlhc.d/case/stateact1_java.java-J-T1--goto-backend.in
index 06868fa6..06868fa6 100644
--- a/test/cases/rlhc.d/case/stateact1_java.java-J-T1--goto-backend.in
+++ b/test/rlhc.d/case/stateact1_java.java-J-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_java.java-J-T1--var-backend.exp b/test/rlhc.d/case/stateact1_java.java-J-T1--var-backend.exp
index 192919cf..192919cf 100644
--- a/test/cases/rlhc.d/case/stateact1_java.java-J-T1--var-backend.exp
+++ b/test/rlhc.d/case/stateact1_java.java-J-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_java.java-J-T1--var-backend.in b/test/rlhc.d/case/stateact1_java.java-J-T1--var-backend.in
index 02831d2b..02831d2b 100644
--- a/test/cases/rlhc.d/case/stateact1_java.java-J-T1--var-backend.in
+++ b/test/rlhc.d/case/stateact1_java.java-J-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_julia.jl-Y-F0--var-backend.exp b/test/rlhc.d/case/stateact1_julia.jl-Y-F0--var-backend.exp
index 0e5c73f0..0e5c73f0 100644
--- a/test/cases/rlhc.d/case/stateact1_julia.jl-Y-F0--var-backend.exp
+++ b/test/rlhc.d/case/stateact1_julia.jl-Y-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_julia.jl-Y-F0--var-backend.in b/test/rlhc.d/case/stateact1_julia.jl-Y-F0--var-backend.in
index d334cf39..d334cf39 100644
--- a/test/cases/rlhc.d/case/stateact1_julia.jl-Y-F0--var-backend.in
+++ b/test/rlhc.d/case/stateact1_julia.jl-Y-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_julia.jl-Y-F1--var-backend.exp b/test/rlhc.d/case/stateact1_julia.jl-Y-F1--var-backend.exp
index 77cacf93..77cacf93 100644
--- a/test/cases/rlhc.d/case/stateact1_julia.jl-Y-F1--var-backend.exp
+++ b/test/rlhc.d/case/stateact1_julia.jl-Y-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_julia.jl-Y-F1--var-backend.in b/test/rlhc.d/case/stateact1_julia.jl-Y-F1--var-backend.in
index 627c9a04..627c9a04 100644
--- a/test/cases/rlhc.d/case/stateact1_julia.jl-Y-F1--var-backend.in
+++ b/test/rlhc.d/case/stateact1_julia.jl-Y-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_julia.jl-Y-T0--var-backend.exp b/test/rlhc.d/case/stateact1_julia.jl-Y-T0--var-backend.exp
index 1e0ff383..1e0ff383 100644
--- a/test/cases/rlhc.d/case/stateact1_julia.jl-Y-T0--var-backend.exp
+++ b/test/rlhc.d/case/stateact1_julia.jl-Y-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_julia.jl-Y-T0--var-backend.in b/test/rlhc.d/case/stateact1_julia.jl-Y-T0--var-backend.in
index 983e16e3..983e16e3 100644
--- a/test/cases/rlhc.d/case/stateact1_julia.jl-Y-T0--var-backend.in
+++ b/test/rlhc.d/case/stateact1_julia.jl-Y-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_julia.jl-Y-T1--var-backend.exp b/test/rlhc.d/case/stateact1_julia.jl-Y-T1--var-backend.exp
index 8f89b818..8f89b818 100644
--- a/test/cases/rlhc.d/case/stateact1_julia.jl-Y-T1--var-backend.exp
+++ b/test/rlhc.d/case/stateact1_julia.jl-Y-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_julia.jl-Y-T1--var-backend.in b/test/rlhc.d/case/stateact1_julia.jl-Y-T1--var-backend.in
index 824785c0..824785c0 100644
--- a/test/cases/rlhc.d/case/stateact1_julia.jl-Y-T1--var-backend.in
+++ b/test/rlhc.d/case/stateact1_julia.jl-Y-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_ocaml.ml-O-F0--var-backend.exp b/test/rlhc.d/case/stateact1_ocaml.ml-O-F0--var-backend.exp
index a92ee6af..a92ee6af 100644
--- a/test/cases/rlhc.d/case/stateact1_ocaml.ml-O-F0--var-backend.exp
+++ b/test/rlhc.d/case/stateact1_ocaml.ml-O-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_ocaml.ml-O-F0--var-backend.in b/test/rlhc.d/case/stateact1_ocaml.ml-O-F0--var-backend.in
index 1accb740..1accb740 100644
--- a/test/cases/rlhc.d/case/stateact1_ocaml.ml-O-F0--var-backend.in
+++ b/test/rlhc.d/case/stateact1_ocaml.ml-O-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_ocaml.ml-O-F1--var-backend.exp b/test/rlhc.d/case/stateact1_ocaml.ml-O-F1--var-backend.exp
index ed77f23e..ed77f23e 100644
--- a/test/cases/rlhc.d/case/stateact1_ocaml.ml-O-F1--var-backend.exp
+++ b/test/rlhc.d/case/stateact1_ocaml.ml-O-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_ocaml.ml-O-F1--var-backend.in b/test/rlhc.d/case/stateact1_ocaml.ml-O-F1--var-backend.in
index a563d9ae..a563d9ae 100644
--- a/test/cases/rlhc.d/case/stateact1_ocaml.ml-O-F1--var-backend.in
+++ b/test/rlhc.d/case/stateact1_ocaml.ml-O-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_ocaml.ml-O-T0--var-backend.exp b/test/rlhc.d/case/stateact1_ocaml.ml-O-T0--var-backend.exp
index ab5441f8..ab5441f8 100644
--- a/test/cases/rlhc.d/case/stateact1_ocaml.ml-O-T0--var-backend.exp
+++ b/test/rlhc.d/case/stateact1_ocaml.ml-O-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_ocaml.ml-O-T0--var-backend.in b/test/rlhc.d/case/stateact1_ocaml.ml-O-T0--var-backend.in
index 50178ab0..50178ab0 100644
--- a/test/cases/rlhc.d/case/stateact1_ocaml.ml-O-T0--var-backend.in
+++ b/test/rlhc.d/case/stateact1_ocaml.ml-O-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_ocaml.ml-O-T1--var-backend.exp b/test/rlhc.d/case/stateact1_ocaml.ml-O-T1--var-backend.exp
index 8e4047c6..8e4047c6 100644
--- a/test/cases/rlhc.d/case/stateact1_ocaml.ml-O-T1--var-backend.exp
+++ b/test/rlhc.d/case/stateact1_ocaml.ml-O-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_ocaml.ml-O-T1--var-backend.in b/test/rlhc.d/case/stateact1_ocaml.ml-O-T1--var-backend.in
index 62349d30..62349d30 100644
--- a/test/cases/rlhc.d/case/stateact1_ocaml.ml-O-T1--var-backend.in
+++ b/test/rlhc.d/case/stateact1_ocaml.ml-O-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_ruby.rb-R-F0--var-backend.exp b/test/rlhc.d/case/stateact1_ruby.rb-R-F0--var-backend.exp
index 166a8fa3..166a8fa3 100644
--- a/test/cases/rlhc.d/case/stateact1_ruby.rb-R-F0--var-backend.exp
+++ b/test/rlhc.d/case/stateact1_ruby.rb-R-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_ruby.rb-R-F0--var-backend.in b/test/rlhc.d/case/stateact1_ruby.rb-R-F0--var-backend.in
index 725fa18b..725fa18b 100644
--- a/test/cases/rlhc.d/case/stateact1_ruby.rb-R-F0--var-backend.in
+++ b/test/rlhc.d/case/stateact1_ruby.rb-R-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_ruby.rb-R-F1--var-backend.exp b/test/rlhc.d/case/stateact1_ruby.rb-R-F1--var-backend.exp
index 37bdbb29..37bdbb29 100644
--- a/test/cases/rlhc.d/case/stateact1_ruby.rb-R-F1--var-backend.exp
+++ b/test/rlhc.d/case/stateact1_ruby.rb-R-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_ruby.rb-R-F1--var-backend.in b/test/rlhc.d/case/stateact1_ruby.rb-R-F1--var-backend.in
index a17a62c1..a17a62c1 100644
--- a/test/cases/rlhc.d/case/stateact1_ruby.rb-R-F1--var-backend.in
+++ b/test/rlhc.d/case/stateact1_ruby.rb-R-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_ruby.rb-R-T0--var-backend.exp b/test/rlhc.d/case/stateact1_ruby.rb-R-T0--var-backend.exp
index 97e6bf5e..97e6bf5e 100644
--- a/test/cases/rlhc.d/case/stateact1_ruby.rb-R-T0--var-backend.exp
+++ b/test/rlhc.d/case/stateact1_ruby.rb-R-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_ruby.rb-R-T0--var-backend.in b/test/rlhc.d/case/stateact1_ruby.rb-R-T0--var-backend.in
index 11bb46cc..11bb46cc 100644
--- a/test/cases/rlhc.d/case/stateact1_ruby.rb-R-T0--var-backend.in
+++ b/test/rlhc.d/case/stateact1_ruby.rb-R-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_ruby.rb-R-T1--var-backend.exp b/test/rlhc.d/case/stateact1_ruby.rb-R-T1--var-backend.exp
index 7b95065e..7b95065e 100644
--- a/test/cases/rlhc.d/case/stateact1_ruby.rb-R-T1--var-backend.exp
+++ b/test/rlhc.d/case/stateact1_ruby.rb-R-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_ruby.rb-R-T1--var-backend.in b/test/rlhc.d/case/stateact1_ruby.rb-R-T1--var-backend.in
index cba8e99c..cba8e99c 100644
--- a/test/cases/rlhc.d/case/stateact1_ruby.rb-R-T1--var-backend.in
+++ b/test/rlhc.d/case/stateact1_ruby.rb-R-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_rust.rs-U-F0--var-backend.exp b/test/rlhc.d/case/stateact1_rust.rs-U-F0--var-backend.exp
index 8ccc2237..8ccc2237 100644
--- a/test/cases/rlhc.d/case/stateact1_rust.rs-U-F0--var-backend.exp
+++ b/test/rlhc.d/case/stateact1_rust.rs-U-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_rust.rs-U-F0--var-backend.in b/test/rlhc.d/case/stateact1_rust.rs-U-F0--var-backend.in
index 383f9156..383f9156 100644
--- a/test/cases/rlhc.d/case/stateact1_rust.rs-U-F0--var-backend.in
+++ b/test/rlhc.d/case/stateact1_rust.rs-U-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_rust.rs-U-F1--var-backend.exp b/test/rlhc.d/case/stateact1_rust.rs-U-F1--var-backend.exp
index 3d23079b..3d23079b 100644
--- a/test/cases/rlhc.d/case/stateact1_rust.rs-U-F1--var-backend.exp
+++ b/test/rlhc.d/case/stateact1_rust.rs-U-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_rust.rs-U-F1--var-backend.in b/test/rlhc.d/case/stateact1_rust.rs-U-F1--var-backend.in
index aa0a64df..aa0a64df 100644
--- a/test/cases/rlhc.d/case/stateact1_rust.rs-U-F1--var-backend.in
+++ b/test/rlhc.d/case/stateact1_rust.rs-U-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_rust.rs-U-T0--var-backend.exp b/test/rlhc.d/case/stateact1_rust.rs-U-T0--var-backend.exp
index 6ab8ffe2..6ab8ffe2 100644
--- a/test/cases/rlhc.d/case/stateact1_rust.rs-U-T0--var-backend.exp
+++ b/test/rlhc.d/case/stateact1_rust.rs-U-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_rust.rs-U-T0--var-backend.in b/test/rlhc.d/case/stateact1_rust.rs-U-T0--var-backend.in
index f22060a2..f22060a2 100644
--- a/test/cases/rlhc.d/case/stateact1_rust.rs-U-T0--var-backend.in
+++ b/test/rlhc.d/case/stateact1_rust.rs-U-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/stateact1_rust.rs-U-T1--var-backend.exp b/test/rlhc.d/case/stateact1_rust.rs-U-T1--var-backend.exp
index b3346dc1..b3346dc1 100644
--- a/test/cases/rlhc.d/case/stateact1_rust.rs-U-T1--var-backend.exp
+++ b/test/rlhc.d/case/stateact1_rust.rs-U-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/stateact1_rust.rs-U-T1--var-backend.in b/test/rlhc.d/case/stateact1_rust.rs-U-T1--var-backend.in
index 4539f237..4539f237 100644
--- a/test/cases/rlhc.d/case/stateact1_rust.rs-U-T1--var-backend.in
+++ b/test/rlhc.d/case/stateact1_rust.rs-U-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/statechart1.c-C-F0--goto-backend.exp b/test/rlhc.d/case/statechart1.c-C-F0--goto-backend.exp
index f811df80..f811df80 100644
--- a/test/cases/rlhc.d/case/statechart1.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/statechart1.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/statechart1.c-C-F0--goto-backend.in b/test/rlhc.d/case/statechart1.c-C-F0--goto-backend.in
index db4f19c5..db4f19c5 100644
--- a/test/cases/rlhc.d/case/statechart1.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/statechart1.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/statechart1.c-C-F0--var-backend.exp b/test/rlhc.d/case/statechart1.c-C-F0--var-backend.exp
index 7ba474d1..7ba474d1 100644
--- a/test/cases/rlhc.d/case/statechart1.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/statechart1.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/statechart1.c-C-F0--var-backend.in b/test/rlhc.d/case/statechart1.c-C-F0--var-backend.in
index 326094ee..326094ee 100644
--- a/test/cases/rlhc.d/case/statechart1.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/statechart1.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/statechart1.c-C-F1--goto-backend.exp b/test/rlhc.d/case/statechart1.c-C-F1--goto-backend.exp
index 2b548411..2b548411 100644
--- a/test/cases/rlhc.d/case/statechart1.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/statechart1.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/statechart1.c-C-F1--goto-backend.in b/test/rlhc.d/case/statechart1.c-C-F1--goto-backend.in
index 1b9524c8..1b9524c8 100644
--- a/test/cases/rlhc.d/case/statechart1.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/statechart1.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/statechart1.c-C-F1--var-backend.exp b/test/rlhc.d/case/statechart1.c-C-F1--var-backend.exp
index 78bb66cf..78bb66cf 100644
--- a/test/cases/rlhc.d/case/statechart1.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/statechart1.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/statechart1.c-C-F1--var-backend.in b/test/rlhc.d/case/statechart1.c-C-F1--var-backend.in
index 73e822f4..73e822f4 100644
--- a/test/cases/rlhc.d/case/statechart1.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/statechart1.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/statechart1.c-C-G0--goto-backend.exp b/test/rlhc.d/case/statechart1.c-C-G0--goto-backend.exp
index 6315b884..6315b884 100644
--- a/test/cases/rlhc.d/case/statechart1.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/statechart1.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/statechart1.c-C-G0--goto-backend.in b/test/rlhc.d/case/statechart1.c-C-G0--goto-backend.in
index 180341fd..180341fd 100644
--- a/test/cases/rlhc.d/case/statechart1.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/statechart1.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/statechart1.c-C-G1--goto-backend.exp b/test/rlhc.d/case/statechart1.c-C-G1--goto-backend.exp
index 4f6aba5e..4f6aba5e 100644
--- a/test/cases/rlhc.d/case/statechart1.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/statechart1.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/statechart1.c-C-G1--goto-backend.in b/test/rlhc.d/case/statechart1.c-C-G1--goto-backend.in
index d8e079e5..d8e079e5 100644
--- a/test/cases/rlhc.d/case/statechart1.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/statechart1.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/statechart1.c-C-G2--goto-backend.exp b/test/rlhc.d/case/statechart1.c-C-G2--goto-backend.exp
index 3a62ca18..3a62ca18 100644
--- a/test/cases/rlhc.d/case/statechart1.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/statechart1.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/statechart1.c-C-G2--goto-backend.in b/test/rlhc.d/case/statechart1.c-C-G2--goto-backend.in
index 8583d0cf..8583d0cf 100644
--- a/test/cases/rlhc.d/case/statechart1.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/statechart1.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/statechart1.c-C-T0--goto-backend.exp b/test/rlhc.d/case/statechart1.c-C-T0--goto-backend.exp
index 7d6ce691..7d6ce691 100644
--- a/test/cases/rlhc.d/case/statechart1.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/statechart1.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/statechart1.c-C-T0--goto-backend.in b/test/rlhc.d/case/statechart1.c-C-T0--goto-backend.in
index dfe9b51d..dfe9b51d 100644
--- a/test/cases/rlhc.d/case/statechart1.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/statechart1.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/statechart1.c-C-T0--var-backend.exp b/test/rlhc.d/case/statechart1.c-C-T0--var-backend.exp
index 422e1c2b..422e1c2b 100644
--- a/test/cases/rlhc.d/case/statechart1.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/statechart1.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/statechart1.c-C-T0--var-backend.in b/test/rlhc.d/case/statechart1.c-C-T0--var-backend.in
index 16cd6818..16cd6818 100644
--- a/test/cases/rlhc.d/case/statechart1.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/statechart1.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/statechart1.c-C-T1--goto-backend.exp b/test/rlhc.d/case/statechart1.c-C-T1--goto-backend.exp
index 78d9a564..78d9a564 100644
--- a/test/cases/rlhc.d/case/statechart1.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/statechart1.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/statechart1.c-C-T1--goto-backend.in b/test/rlhc.d/case/statechart1.c-C-T1--goto-backend.in
index 70640299..70640299 100644
--- a/test/cases/rlhc.d/case/statechart1.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/statechart1.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/statechart1.c-C-T1--var-backend.exp b/test/rlhc.d/case/statechart1.c-C-T1--var-backend.exp
index 0cd82888..0cd82888 100644
--- a/test/cases/rlhc.d/case/statechart1.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/statechart1.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/statechart1.c-C-T1--var-backend.in b/test/rlhc.d/case/statechart1.c-C-T1--var-backend.in
index 9724204b..9724204b 100644
--- a/test/cases/rlhc.d/case/statechart1.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/statechart1.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/strings1.c-C-F0--goto-backend.exp b/test/rlhc.d/case/strings1.c-C-F0--goto-backend.exp
index 2cea0f6e..2cea0f6e 100644
--- a/test/cases/rlhc.d/case/strings1.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/strings1.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/strings1.c-C-F0--goto-backend.in b/test/rlhc.d/case/strings1.c-C-F0--goto-backend.in
index 85278bf4..85278bf4 100644
--- a/test/cases/rlhc.d/case/strings1.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/strings1.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/strings1.c-C-F0--var-backend.exp b/test/rlhc.d/case/strings1.c-C-F0--var-backend.exp
index d32047b7..d32047b7 100644
--- a/test/cases/rlhc.d/case/strings1.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/strings1.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/strings1.c-C-F0--var-backend.in b/test/rlhc.d/case/strings1.c-C-F0--var-backend.in
index a73ea78c..a73ea78c 100644
--- a/test/cases/rlhc.d/case/strings1.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/strings1.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/strings1.c-C-F1--goto-backend.exp b/test/rlhc.d/case/strings1.c-C-F1--goto-backend.exp
index c539f608..c539f608 100644
--- a/test/cases/rlhc.d/case/strings1.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/strings1.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/strings1.c-C-F1--goto-backend.in b/test/rlhc.d/case/strings1.c-C-F1--goto-backend.in
index 014933f0..014933f0 100644
--- a/test/cases/rlhc.d/case/strings1.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/strings1.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/strings1.c-C-F1--var-backend.exp b/test/rlhc.d/case/strings1.c-C-F1--var-backend.exp
index d32047b7..d32047b7 100644
--- a/test/cases/rlhc.d/case/strings1.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/strings1.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/strings1.c-C-F1--var-backend.in b/test/rlhc.d/case/strings1.c-C-F1--var-backend.in
index a73ea78c..a73ea78c 100644
--- a/test/cases/rlhc.d/case/strings1.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/strings1.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/strings1.c-C-G0--goto-backend.exp b/test/rlhc.d/case/strings1.c-C-G0--goto-backend.exp
index 39f8ef52..39f8ef52 100644
--- a/test/cases/rlhc.d/case/strings1.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/strings1.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/strings1.c-C-G0--goto-backend.in b/test/rlhc.d/case/strings1.c-C-G0--goto-backend.in
index 52f1a916..52f1a916 100644
--- a/test/cases/rlhc.d/case/strings1.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/strings1.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/strings1.c-C-G1--goto-backend.exp b/test/rlhc.d/case/strings1.c-C-G1--goto-backend.exp
index 9fe48cc6..9fe48cc6 100644
--- a/test/cases/rlhc.d/case/strings1.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/strings1.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/strings1.c-C-G1--goto-backend.in b/test/rlhc.d/case/strings1.c-C-G1--goto-backend.in
index c382e660..c382e660 100644
--- a/test/cases/rlhc.d/case/strings1.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/strings1.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/strings1.c-C-G2--goto-backend.exp b/test/rlhc.d/case/strings1.c-C-G2--goto-backend.exp
index 8b240984..8b240984 100644
--- a/test/cases/rlhc.d/case/strings1.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/strings1.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/strings1.c-C-G2--goto-backend.in b/test/rlhc.d/case/strings1.c-C-G2--goto-backend.in
index f50cf8bb..f50cf8bb 100644
--- a/test/cases/rlhc.d/case/strings1.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/strings1.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/strings1.c-C-T0--goto-backend.exp b/test/rlhc.d/case/strings1.c-C-T0--goto-backend.exp
index 2576191b..2576191b 100644
--- a/test/cases/rlhc.d/case/strings1.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/strings1.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/strings1.c-C-T0--goto-backend.in b/test/rlhc.d/case/strings1.c-C-T0--goto-backend.in
index cfe339b8..cfe339b8 100644
--- a/test/cases/rlhc.d/case/strings1.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/strings1.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/strings1.c-C-T0--var-backend.exp b/test/rlhc.d/case/strings1.c-C-T0--var-backend.exp
index f33b92cc..f33b92cc 100644
--- a/test/cases/rlhc.d/case/strings1.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/strings1.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/strings1.c-C-T0--var-backend.in b/test/rlhc.d/case/strings1.c-C-T0--var-backend.in
index de2e341e..de2e341e 100644
--- a/test/cases/rlhc.d/case/strings1.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/strings1.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/strings1.c-C-T1--goto-backend.exp b/test/rlhc.d/case/strings1.c-C-T1--goto-backend.exp
index e96d8618..e96d8618 100644
--- a/test/cases/rlhc.d/case/strings1.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/strings1.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/strings1.c-C-T1--goto-backend.in b/test/rlhc.d/case/strings1.c-C-T1--goto-backend.in
index ce989912..ce989912 100644
--- a/test/cases/rlhc.d/case/strings1.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/strings1.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/strings1.c-C-T1--var-backend.exp b/test/rlhc.d/case/strings1.c-C-T1--var-backend.exp
index 062a7fbb..062a7fbb 100644
--- a/test/cases/rlhc.d/case/strings1.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/strings1.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/strings1.c-C-T1--var-backend.in b/test/rlhc.d/case/strings1.c-C-T1--var-backend.in
index f3a7e89c..f3a7e89c 100644
--- a/test/cases/rlhc.d/case/strings1.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/strings1.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/strings2.c-C-F0--goto-backend.exp b/test/rlhc.d/case/strings2.c-C-F0--goto-backend.exp
index 5a92b857..5a92b857 100644
--- a/test/cases/rlhc.d/case/strings2.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/strings2.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/strings2.c-C-F0--goto-backend.in b/test/rlhc.d/case/strings2.c-C-F0--goto-backend.in
index 4b7676d7..4b7676d7 100644
--- a/test/cases/rlhc.d/case/strings2.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/strings2.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/strings2.c-C-F0--var-backend.exp b/test/rlhc.d/case/strings2.c-C-F0--var-backend.exp
index b0e494f7..b0e494f7 100644
--- a/test/cases/rlhc.d/case/strings2.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/strings2.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/strings2.c-C-F0--var-backend.in b/test/rlhc.d/case/strings2.c-C-F0--var-backend.in
index 3675698f..3675698f 100644
--- a/test/cases/rlhc.d/case/strings2.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/strings2.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/strings2.c-C-F1--goto-backend.exp b/test/rlhc.d/case/strings2.c-C-F1--goto-backend.exp
index 8233cfa8..8233cfa8 100644
--- a/test/cases/rlhc.d/case/strings2.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/strings2.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/strings2.c-C-F1--goto-backend.in b/test/rlhc.d/case/strings2.c-C-F1--goto-backend.in
index e4688ec3..e4688ec3 100644
--- a/test/cases/rlhc.d/case/strings2.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/strings2.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/strings2.c-C-F1--var-backend.exp b/test/rlhc.d/case/strings2.c-C-F1--var-backend.exp
index b0e494f7..b0e494f7 100644
--- a/test/cases/rlhc.d/case/strings2.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/strings2.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/strings2.c-C-F1--var-backend.in b/test/rlhc.d/case/strings2.c-C-F1--var-backend.in
index 3675698f..3675698f 100644
--- a/test/cases/rlhc.d/case/strings2.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/strings2.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/strings2.c-C-G0--goto-backend.exp b/test/rlhc.d/case/strings2.c-C-G0--goto-backend.exp
index 4768112e..4768112e 100644
--- a/test/cases/rlhc.d/case/strings2.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/strings2.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/strings2.c-C-G0--goto-backend.in b/test/rlhc.d/case/strings2.c-C-G0--goto-backend.in
index 751c2282..751c2282 100644
--- a/test/cases/rlhc.d/case/strings2.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/strings2.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/strings2.c-C-G1--goto-backend.exp b/test/rlhc.d/case/strings2.c-C-G1--goto-backend.exp
index 199429f8..199429f8 100644
--- a/test/cases/rlhc.d/case/strings2.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/strings2.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/strings2.c-C-G1--goto-backend.in b/test/rlhc.d/case/strings2.c-C-G1--goto-backend.in
index 2ebd7018..2ebd7018 100644
--- a/test/cases/rlhc.d/case/strings2.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/strings2.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/strings2.c-C-G2--goto-backend.exp b/test/rlhc.d/case/strings2.c-C-G2--goto-backend.exp
index d9f13389..d9f13389 100644
--- a/test/cases/rlhc.d/case/strings2.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/strings2.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/strings2.c-C-G2--goto-backend.in b/test/rlhc.d/case/strings2.c-C-G2--goto-backend.in
index 8890dac9..8890dac9 100644
--- a/test/cases/rlhc.d/case/strings2.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/strings2.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/strings2.c-C-T0--goto-backend.exp b/test/rlhc.d/case/strings2.c-C-T0--goto-backend.exp
index 623b913c..623b913c 100644
--- a/test/cases/rlhc.d/case/strings2.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/strings2.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/strings2.c-C-T0--goto-backend.in b/test/rlhc.d/case/strings2.c-C-T0--goto-backend.in
index b045785e..b045785e 100644
--- a/test/cases/rlhc.d/case/strings2.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/strings2.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/strings2.c-C-T0--var-backend.exp b/test/rlhc.d/case/strings2.c-C-T0--var-backend.exp
index 4e836130..4e836130 100644
--- a/test/cases/rlhc.d/case/strings2.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/strings2.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/strings2.c-C-T0--var-backend.in b/test/rlhc.d/case/strings2.c-C-T0--var-backend.in
index 0a652369..0a652369 100644
--- a/test/cases/rlhc.d/case/strings2.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/strings2.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/strings2.c-C-T1--goto-backend.exp b/test/rlhc.d/case/strings2.c-C-T1--goto-backend.exp
index 4633e595..4633e595 100644
--- a/test/cases/rlhc.d/case/strings2.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/strings2.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/strings2.c-C-T1--goto-backend.in b/test/rlhc.d/case/strings2.c-C-T1--goto-backend.in
index 9e5e78ba..9e5e78ba 100644
--- a/test/cases/rlhc.d/case/strings2.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/strings2.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/strings2.c-C-T1--var-backend.exp b/test/rlhc.d/case/strings2.c-C-T1--var-backend.exp
index bfe3d741..bfe3d741 100644
--- a/test/cases/rlhc.d/case/strings2.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/strings2.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/strings2.c-C-T1--var-backend.in b/test/rlhc.d/case/strings2.c-C-T1--var-backend.in
index f621f54d..f621f54d 100644
--- a/test/cases/rlhc.d/case/strings2.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/strings2.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_c.c-C-F0--goto-backend.exp b/test/rlhc.d/case/targs1_c.c-C-F0--goto-backend.exp
index 3068acfe..3068acfe 100644
--- a/test/cases/rlhc.d/case/targs1_c.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/targs1_c.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_c.c-C-F0--goto-backend.in b/test/rlhc.d/case/targs1_c.c-C-F0--goto-backend.in
index 915a1218..915a1218 100644
--- a/test/cases/rlhc.d/case/targs1_c.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/targs1_c.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_c.c-C-F0--var-backend.exp b/test/rlhc.d/case/targs1_c.c-C-F0--var-backend.exp
index ed5dcebc..ed5dcebc 100644
--- a/test/cases/rlhc.d/case/targs1_c.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/targs1_c.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_c.c-C-F0--var-backend.in b/test/rlhc.d/case/targs1_c.c-C-F0--var-backend.in
index 434dca21..434dca21 100644
--- a/test/cases/rlhc.d/case/targs1_c.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/targs1_c.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_c.c-C-F1--goto-backend.exp b/test/rlhc.d/case/targs1_c.c-C-F1--goto-backend.exp
index 8d578027..8d578027 100644
--- a/test/cases/rlhc.d/case/targs1_c.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/targs1_c.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_c.c-C-F1--goto-backend.in b/test/rlhc.d/case/targs1_c.c-C-F1--goto-backend.in
index df9f8d0d..df9f8d0d 100644
--- a/test/cases/rlhc.d/case/targs1_c.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/targs1_c.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_c.c-C-F1--var-backend.exp b/test/rlhc.d/case/targs1_c.c-C-F1--var-backend.exp
index cf839515..cf839515 100644
--- a/test/cases/rlhc.d/case/targs1_c.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/targs1_c.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_c.c-C-F1--var-backend.in b/test/rlhc.d/case/targs1_c.c-C-F1--var-backend.in
index 16f22c6a..16f22c6a 100644
--- a/test/cases/rlhc.d/case/targs1_c.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/targs1_c.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_c.c-C-G0--goto-backend.exp b/test/rlhc.d/case/targs1_c.c-C-G0--goto-backend.exp
index 86b1761f..86b1761f 100644
--- a/test/cases/rlhc.d/case/targs1_c.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/targs1_c.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_c.c-C-G0--goto-backend.in b/test/rlhc.d/case/targs1_c.c-C-G0--goto-backend.in
index bccee7b1..bccee7b1 100644
--- a/test/cases/rlhc.d/case/targs1_c.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/targs1_c.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_c.c-C-G1--goto-backend.exp b/test/rlhc.d/case/targs1_c.c-C-G1--goto-backend.exp
index 03a70043..03a70043 100644
--- a/test/cases/rlhc.d/case/targs1_c.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/targs1_c.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_c.c-C-G1--goto-backend.in b/test/rlhc.d/case/targs1_c.c-C-G1--goto-backend.in
index f2dbccd9..f2dbccd9 100644
--- a/test/cases/rlhc.d/case/targs1_c.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/targs1_c.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_c.c-C-G2--goto-backend.exp b/test/rlhc.d/case/targs1_c.c-C-G2--goto-backend.exp
index e325f622..e325f622 100644
--- a/test/cases/rlhc.d/case/targs1_c.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/targs1_c.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_c.c-C-G2--goto-backend.in b/test/rlhc.d/case/targs1_c.c-C-G2--goto-backend.in
index 5dfcf9ee..5dfcf9ee 100644
--- a/test/cases/rlhc.d/case/targs1_c.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/targs1_c.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_c.c-C-T0--goto-backend.exp b/test/rlhc.d/case/targs1_c.c-C-T0--goto-backend.exp
index f932b09c..f932b09c 100644
--- a/test/cases/rlhc.d/case/targs1_c.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/targs1_c.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_c.c-C-T0--goto-backend.in b/test/rlhc.d/case/targs1_c.c-C-T0--goto-backend.in
index 67c34881..67c34881 100644
--- a/test/cases/rlhc.d/case/targs1_c.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/targs1_c.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_c.c-C-T0--var-backend.exp b/test/rlhc.d/case/targs1_c.c-C-T0--var-backend.exp
index d84da6fa..d84da6fa 100644
--- a/test/cases/rlhc.d/case/targs1_c.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/targs1_c.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_c.c-C-T0--var-backend.in b/test/rlhc.d/case/targs1_c.c-C-T0--var-backend.in
index 8ff48169..8ff48169 100644
--- a/test/cases/rlhc.d/case/targs1_c.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/targs1_c.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_c.c-C-T1--goto-backend.exp b/test/rlhc.d/case/targs1_c.c-C-T1--goto-backend.exp
index fe9d73a6..fe9d73a6 100644
--- a/test/cases/rlhc.d/case/targs1_c.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/targs1_c.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_c.c-C-T1--goto-backend.in b/test/rlhc.d/case/targs1_c.c-C-T1--goto-backend.in
index 27421afc..27421afc 100644
--- a/test/cases/rlhc.d/case/targs1_c.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/targs1_c.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_c.c-C-T1--var-backend.exp b/test/rlhc.d/case/targs1_c.c-C-T1--var-backend.exp
index ba46430d..ba46430d 100644
--- a/test/cases/rlhc.d/case/targs1_c.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/targs1_c.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_c.c-C-T1--var-backend.in b/test/rlhc.d/case/targs1_c.c-C-T1--var-backend.in
index 6a2c404e..6a2c404e 100644
--- a/test/cases/rlhc.d/case/targs1_c.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/targs1_c.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_crack.crk-K-F0--var-backend.exp b/test/rlhc.d/case/targs1_crack.crk-K-F0--var-backend.exp
index 0507b85e..0507b85e 100644
--- a/test/cases/rlhc.d/case/targs1_crack.crk-K-F0--var-backend.exp
+++ b/test/rlhc.d/case/targs1_crack.crk-K-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_crack.crk-K-F0--var-backend.in b/test/rlhc.d/case/targs1_crack.crk-K-F0--var-backend.in
index 8c2176a3..8c2176a3 100644
--- a/test/cases/rlhc.d/case/targs1_crack.crk-K-F0--var-backend.in
+++ b/test/rlhc.d/case/targs1_crack.crk-K-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_crack.crk-K-F1--var-backend.exp b/test/rlhc.d/case/targs1_crack.crk-K-F1--var-backend.exp
index f6299205..f6299205 100644
--- a/test/cases/rlhc.d/case/targs1_crack.crk-K-F1--var-backend.exp
+++ b/test/rlhc.d/case/targs1_crack.crk-K-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_crack.crk-K-F1--var-backend.in b/test/rlhc.d/case/targs1_crack.crk-K-F1--var-backend.in
index 8bf8229b..8bf8229b 100644
--- a/test/cases/rlhc.d/case/targs1_crack.crk-K-F1--var-backend.in
+++ b/test/rlhc.d/case/targs1_crack.crk-K-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_crack.crk-K-T0--var-backend.exp b/test/rlhc.d/case/targs1_crack.crk-K-T0--var-backend.exp
index d7184919..d7184919 100644
--- a/test/cases/rlhc.d/case/targs1_crack.crk-K-T0--var-backend.exp
+++ b/test/rlhc.d/case/targs1_crack.crk-K-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_crack.crk-K-T0--var-backend.in b/test/rlhc.d/case/targs1_crack.crk-K-T0--var-backend.in
index 1f5dd60e..1f5dd60e 100644
--- a/test/cases/rlhc.d/case/targs1_crack.crk-K-T0--var-backend.in
+++ b/test/rlhc.d/case/targs1_crack.crk-K-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_crack.crk-K-T1--var-backend.exp b/test/rlhc.d/case/targs1_crack.crk-K-T1--var-backend.exp
index dbdaebe7..dbdaebe7 100644
--- a/test/cases/rlhc.d/case/targs1_crack.crk-K-T1--var-backend.exp
+++ b/test/rlhc.d/case/targs1_crack.crk-K-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_crack.crk-K-T1--var-backend.in b/test/rlhc.d/case/targs1_crack.crk-K-T1--var-backend.in
index c52ddb46..c52ddb46 100644
--- a/test/cases/rlhc.d/case/targs1_crack.crk-K-T1--var-backend.in
+++ b/test/rlhc.d/case/targs1_crack.crk-K-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_cs.cs-A-F0--goto-backend.exp b/test/rlhc.d/case/targs1_cs.cs-A-F0--goto-backend.exp
index c100c5dd..c100c5dd 100644
--- a/test/cases/rlhc.d/case/targs1_cs.cs-A-F0--goto-backend.exp
+++ b/test/rlhc.d/case/targs1_cs.cs-A-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_cs.cs-A-F0--goto-backend.in b/test/rlhc.d/case/targs1_cs.cs-A-F0--goto-backend.in
index 22664fe4..22664fe4 100644
--- a/test/cases/rlhc.d/case/targs1_cs.cs-A-F0--goto-backend.in
+++ b/test/rlhc.d/case/targs1_cs.cs-A-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_cs.cs-A-F0--var-backend.exp b/test/rlhc.d/case/targs1_cs.cs-A-F0--var-backend.exp
index db4b849c..db4b849c 100644
--- a/test/cases/rlhc.d/case/targs1_cs.cs-A-F0--var-backend.exp
+++ b/test/rlhc.d/case/targs1_cs.cs-A-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_cs.cs-A-F0--var-backend.in b/test/rlhc.d/case/targs1_cs.cs-A-F0--var-backend.in
index 0e5937ff..0e5937ff 100644
--- a/test/cases/rlhc.d/case/targs1_cs.cs-A-F0--var-backend.in
+++ b/test/rlhc.d/case/targs1_cs.cs-A-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_cs.cs-A-F1--goto-backend.exp b/test/rlhc.d/case/targs1_cs.cs-A-F1--goto-backend.exp
index d5bafb62..d5bafb62 100644
--- a/test/cases/rlhc.d/case/targs1_cs.cs-A-F1--goto-backend.exp
+++ b/test/rlhc.d/case/targs1_cs.cs-A-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_cs.cs-A-F1--goto-backend.in b/test/rlhc.d/case/targs1_cs.cs-A-F1--goto-backend.in
index abc51657..abc51657 100644
--- a/test/cases/rlhc.d/case/targs1_cs.cs-A-F1--goto-backend.in
+++ b/test/rlhc.d/case/targs1_cs.cs-A-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_cs.cs-A-F1--var-backend.exp b/test/rlhc.d/case/targs1_cs.cs-A-F1--var-backend.exp
index 431f018e..431f018e 100644
--- a/test/cases/rlhc.d/case/targs1_cs.cs-A-F1--var-backend.exp
+++ b/test/rlhc.d/case/targs1_cs.cs-A-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_cs.cs-A-F1--var-backend.in b/test/rlhc.d/case/targs1_cs.cs-A-F1--var-backend.in
index 5e87d7d2..5e87d7d2 100644
--- a/test/cases/rlhc.d/case/targs1_cs.cs-A-F1--var-backend.in
+++ b/test/rlhc.d/case/targs1_cs.cs-A-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_cs.cs-A-G0--goto-backend.exp b/test/rlhc.d/case/targs1_cs.cs-A-G0--goto-backend.exp
index b52f2765..b52f2765 100644
--- a/test/cases/rlhc.d/case/targs1_cs.cs-A-G0--goto-backend.exp
+++ b/test/rlhc.d/case/targs1_cs.cs-A-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_cs.cs-A-G0--goto-backend.in b/test/rlhc.d/case/targs1_cs.cs-A-G0--goto-backend.in
index 4361de1c..4361de1c 100644
--- a/test/cases/rlhc.d/case/targs1_cs.cs-A-G0--goto-backend.in
+++ b/test/rlhc.d/case/targs1_cs.cs-A-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_cs.cs-A-G1--goto-backend.exp b/test/rlhc.d/case/targs1_cs.cs-A-G1--goto-backend.exp
index 6d60d47c..6d60d47c 100644
--- a/test/cases/rlhc.d/case/targs1_cs.cs-A-G1--goto-backend.exp
+++ b/test/rlhc.d/case/targs1_cs.cs-A-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_cs.cs-A-G1--goto-backend.in b/test/rlhc.d/case/targs1_cs.cs-A-G1--goto-backend.in
index e22cddd0..e22cddd0 100644
--- a/test/cases/rlhc.d/case/targs1_cs.cs-A-G1--goto-backend.in
+++ b/test/rlhc.d/case/targs1_cs.cs-A-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_cs.cs-A-T0--goto-backend.exp b/test/rlhc.d/case/targs1_cs.cs-A-T0--goto-backend.exp
index f23c533e..f23c533e 100644
--- a/test/cases/rlhc.d/case/targs1_cs.cs-A-T0--goto-backend.exp
+++ b/test/rlhc.d/case/targs1_cs.cs-A-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_cs.cs-A-T0--goto-backend.in b/test/rlhc.d/case/targs1_cs.cs-A-T0--goto-backend.in
index 3ec7989f..3ec7989f 100644
--- a/test/cases/rlhc.d/case/targs1_cs.cs-A-T0--goto-backend.in
+++ b/test/rlhc.d/case/targs1_cs.cs-A-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_cs.cs-A-T0--var-backend.exp b/test/rlhc.d/case/targs1_cs.cs-A-T0--var-backend.exp
index e56d5175..e56d5175 100644
--- a/test/cases/rlhc.d/case/targs1_cs.cs-A-T0--var-backend.exp
+++ b/test/rlhc.d/case/targs1_cs.cs-A-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_cs.cs-A-T0--var-backend.in b/test/rlhc.d/case/targs1_cs.cs-A-T0--var-backend.in
index 8b0eda71..8b0eda71 100644
--- a/test/cases/rlhc.d/case/targs1_cs.cs-A-T0--var-backend.in
+++ b/test/rlhc.d/case/targs1_cs.cs-A-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_cs.cs-A-T1--goto-backend.exp b/test/rlhc.d/case/targs1_cs.cs-A-T1--goto-backend.exp
index af592357..af592357 100644
--- a/test/cases/rlhc.d/case/targs1_cs.cs-A-T1--goto-backend.exp
+++ b/test/rlhc.d/case/targs1_cs.cs-A-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_cs.cs-A-T1--goto-backend.in b/test/rlhc.d/case/targs1_cs.cs-A-T1--goto-backend.in
index 927d04c9..927d04c9 100644
--- a/test/cases/rlhc.d/case/targs1_cs.cs-A-T1--goto-backend.in
+++ b/test/rlhc.d/case/targs1_cs.cs-A-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_cs.cs-A-T1--var-backend.exp b/test/rlhc.d/case/targs1_cs.cs-A-T1--var-backend.exp
index 1c8d2bff..1c8d2bff 100644
--- a/test/cases/rlhc.d/case/targs1_cs.cs-A-T1--var-backend.exp
+++ b/test/rlhc.d/case/targs1_cs.cs-A-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_cs.cs-A-T1--var-backend.in b/test/rlhc.d/case/targs1_cs.cs-A-T1--var-backend.in
index d44b9417..d44b9417 100644
--- a/test/cases/rlhc.d/case/targs1_cs.cs-A-T1--var-backend.in
+++ b/test/rlhc.d/case/targs1_cs.cs-A-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_go.go-Z-F0--goto-backend.exp b/test/rlhc.d/case/targs1_go.go-Z-F0--goto-backend.exp
index ce2881e4..ce2881e4 100644
--- a/test/cases/rlhc.d/case/targs1_go.go-Z-F0--goto-backend.exp
+++ b/test/rlhc.d/case/targs1_go.go-Z-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_go.go-Z-F0--goto-backend.in b/test/rlhc.d/case/targs1_go.go-Z-F0--goto-backend.in
index a30ddf6b..a30ddf6b 100644
--- a/test/cases/rlhc.d/case/targs1_go.go-Z-F0--goto-backend.in
+++ b/test/rlhc.d/case/targs1_go.go-Z-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_go.go-Z-F0--var-backend.exp b/test/rlhc.d/case/targs1_go.go-Z-F0--var-backend.exp
index 49b06fee..49b06fee 100644
--- a/test/cases/rlhc.d/case/targs1_go.go-Z-F0--var-backend.exp
+++ b/test/rlhc.d/case/targs1_go.go-Z-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_go.go-Z-F0--var-backend.in b/test/rlhc.d/case/targs1_go.go-Z-F0--var-backend.in
index 95f84a0c..95f84a0c 100644
--- a/test/cases/rlhc.d/case/targs1_go.go-Z-F0--var-backend.in
+++ b/test/rlhc.d/case/targs1_go.go-Z-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_go.go-Z-F1--goto-backend.exp b/test/rlhc.d/case/targs1_go.go-Z-F1--goto-backend.exp
index 1b183ca8..1b183ca8 100644
--- a/test/cases/rlhc.d/case/targs1_go.go-Z-F1--goto-backend.exp
+++ b/test/rlhc.d/case/targs1_go.go-Z-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_go.go-Z-F1--goto-backend.in b/test/rlhc.d/case/targs1_go.go-Z-F1--goto-backend.in
index 831cc8a7..831cc8a7 100644
--- a/test/cases/rlhc.d/case/targs1_go.go-Z-F1--goto-backend.in
+++ b/test/rlhc.d/case/targs1_go.go-Z-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_go.go-Z-F1--var-backend.exp b/test/rlhc.d/case/targs1_go.go-Z-F1--var-backend.exp
index ad7b8aeb..ad7b8aeb 100644
--- a/test/cases/rlhc.d/case/targs1_go.go-Z-F1--var-backend.exp
+++ b/test/rlhc.d/case/targs1_go.go-Z-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_go.go-Z-F1--var-backend.in b/test/rlhc.d/case/targs1_go.go-Z-F1--var-backend.in
index 635a814d..635a814d 100644
--- a/test/cases/rlhc.d/case/targs1_go.go-Z-F1--var-backend.in
+++ b/test/rlhc.d/case/targs1_go.go-Z-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_go.go-Z-G0--goto-backend.exp b/test/rlhc.d/case/targs1_go.go-Z-G0--goto-backend.exp
index cb826e2d..cb826e2d 100644
--- a/test/cases/rlhc.d/case/targs1_go.go-Z-G0--goto-backend.exp
+++ b/test/rlhc.d/case/targs1_go.go-Z-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_go.go-Z-G0--goto-backend.in b/test/rlhc.d/case/targs1_go.go-Z-G0--goto-backend.in
index 274b1ad6..274b1ad6 100644
--- a/test/cases/rlhc.d/case/targs1_go.go-Z-G0--goto-backend.in
+++ b/test/rlhc.d/case/targs1_go.go-Z-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_go.go-Z-G1--goto-backend.exp b/test/rlhc.d/case/targs1_go.go-Z-G1--goto-backend.exp
index c66ecd8c..c66ecd8c 100644
--- a/test/cases/rlhc.d/case/targs1_go.go-Z-G1--goto-backend.exp
+++ b/test/rlhc.d/case/targs1_go.go-Z-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_go.go-Z-G1--goto-backend.in b/test/rlhc.d/case/targs1_go.go-Z-G1--goto-backend.in
index 240ad1db..240ad1db 100644
--- a/test/cases/rlhc.d/case/targs1_go.go-Z-G1--goto-backend.in
+++ b/test/rlhc.d/case/targs1_go.go-Z-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_go.go-Z-G2--goto-backend.exp b/test/rlhc.d/case/targs1_go.go-Z-G2--goto-backend.exp
index aa25340e..aa25340e 100644
--- a/test/cases/rlhc.d/case/targs1_go.go-Z-G2--goto-backend.exp
+++ b/test/rlhc.d/case/targs1_go.go-Z-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_go.go-Z-G2--goto-backend.in b/test/rlhc.d/case/targs1_go.go-Z-G2--goto-backend.in
index 7632bf4e..7632bf4e 100644
--- a/test/cases/rlhc.d/case/targs1_go.go-Z-G2--goto-backend.in
+++ b/test/rlhc.d/case/targs1_go.go-Z-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_go.go-Z-T0--goto-backend.exp b/test/rlhc.d/case/targs1_go.go-Z-T0--goto-backend.exp
index 1fd8b360..1fd8b360 100644
--- a/test/cases/rlhc.d/case/targs1_go.go-Z-T0--goto-backend.exp
+++ b/test/rlhc.d/case/targs1_go.go-Z-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_go.go-Z-T0--goto-backend.in b/test/rlhc.d/case/targs1_go.go-Z-T0--goto-backend.in
index 4c3869e1..4c3869e1 100644
--- a/test/cases/rlhc.d/case/targs1_go.go-Z-T0--goto-backend.in
+++ b/test/rlhc.d/case/targs1_go.go-Z-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_go.go-Z-T0--var-backend.exp b/test/rlhc.d/case/targs1_go.go-Z-T0--var-backend.exp
index 9ee44482..9ee44482 100644
--- a/test/cases/rlhc.d/case/targs1_go.go-Z-T0--var-backend.exp
+++ b/test/rlhc.d/case/targs1_go.go-Z-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_go.go-Z-T0--var-backend.in b/test/rlhc.d/case/targs1_go.go-Z-T0--var-backend.in
index 800a740f..800a740f 100644
--- a/test/cases/rlhc.d/case/targs1_go.go-Z-T0--var-backend.in
+++ b/test/rlhc.d/case/targs1_go.go-Z-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_go.go-Z-T1--goto-backend.exp b/test/rlhc.d/case/targs1_go.go-Z-T1--goto-backend.exp
index e12ad4bc..e12ad4bc 100644
--- a/test/cases/rlhc.d/case/targs1_go.go-Z-T1--goto-backend.exp
+++ b/test/rlhc.d/case/targs1_go.go-Z-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_go.go-Z-T1--goto-backend.in b/test/rlhc.d/case/targs1_go.go-Z-T1--goto-backend.in
index 7cb642d6..7cb642d6 100644
--- a/test/cases/rlhc.d/case/targs1_go.go-Z-T1--goto-backend.in
+++ b/test/rlhc.d/case/targs1_go.go-Z-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_go.go-Z-T1--var-backend.exp b/test/rlhc.d/case/targs1_go.go-Z-T1--var-backend.exp
index c0cc81f5..c0cc81f5 100644
--- a/test/cases/rlhc.d/case/targs1_go.go-Z-T1--var-backend.exp
+++ b/test/rlhc.d/case/targs1_go.go-Z-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_go.go-Z-T1--var-backend.in b/test/rlhc.d/case/targs1_go.go-Z-T1--var-backend.in
index 87b515e9..87b515e9 100644
--- a/test/cases/rlhc.d/case/targs1_go.go-Z-T1--var-backend.in
+++ b/test/rlhc.d/case/targs1_go.go-Z-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_java.java-J-F0--goto-backend.exp b/test/rlhc.d/case/targs1_java.java-J-F0--goto-backend.exp
index 51f4fccc..51f4fccc 100644
--- a/test/cases/rlhc.d/case/targs1_java.java-J-F0--goto-backend.exp
+++ b/test/rlhc.d/case/targs1_java.java-J-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_java.java-J-F0--goto-backend.in b/test/rlhc.d/case/targs1_java.java-J-F0--goto-backend.in
index d8d6a983..d8d6a983 100644
--- a/test/cases/rlhc.d/case/targs1_java.java-J-F0--goto-backend.in
+++ b/test/rlhc.d/case/targs1_java.java-J-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_java.java-J-F0--var-backend.exp b/test/rlhc.d/case/targs1_java.java-J-F0--var-backend.exp
index 9fcc9111..9fcc9111 100644
--- a/test/cases/rlhc.d/case/targs1_java.java-J-F0--var-backend.exp
+++ b/test/rlhc.d/case/targs1_java.java-J-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_java.java-J-F0--var-backend.in b/test/rlhc.d/case/targs1_java.java-J-F0--var-backend.in
index e00056c6..e00056c6 100644
--- a/test/cases/rlhc.d/case/targs1_java.java-J-F0--var-backend.in
+++ b/test/rlhc.d/case/targs1_java.java-J-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_java.java-J-F1--goto-backend.exp b/test/rlhc.d/case/targs1_java.java-J-F1--goto-backend.exp
index 85b2156d..85b2156d 100644
--- a/test/cases/rlhc.d/case/targs1_java.java-J-F1--goto-backend.exp
+++ b/test/rlhc.d/case/targs1_java.java-J-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_java.java-J-F1--goto-backend.in b/test/rlhc.d/case/targs1_java.java-J-F1--goto-backend.in
index e8d6c9d7..e8d6c9d7 100644
--- a/test/cases/rlhc.d/case/targs1_java.java-J-F1--goto-backend.in
+++ b/test/rlhc.d/case/targs1_java.java-J-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_java.java-J-F1--var-backend.exp b/test/rlhc.d/case/targs1_java.java-J-F1--var-backend.exp
index be0afce1..be0afce1 100644
--- a/test/cases/rlhc.d/case/targs1_java.java-J-F1--var-backend.exp
+++ b/test/rlhc.d/case/targs1_java.java-J-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_java.java-J-F1--var-backend.in b/test/rlhc.d/case/targs1_java.java-J-F1--var-backend.in
index 116c4c81..116c4c81 100644
--- a/test/cases/rlhc.d/case/targs1_java.java-J-F1--var-backend.in
+++ b/test/rlhc.d/case/targs1_java.java-J-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_java.java-J-T0--goto-backend.exp b/test/rlhc.d/case/targs1_java.java-J-T0--goto-backend.exp
index 2c31ff14..2c31ff14 100644
--- a/test/cases/rlhc.d/case/targs1_java.java-J-T0--goto-backend.exp
+++ b/test/rlhc.d/case/targs1_java.java-J-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_java.java-J-T0--goto-backend.in b/test/rlhc.d/case/targs1_java.java-J-T0--goto-backend.in
index 68d4886f..68d4886f 100644
--- a/test/cases/rlhc.d/case/targs1_java.java-J-T0--goto-backend.in
+++ b/test/rlhc.d/case/targs1_java.java-J-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_java.java-J-T0--var-backend.exp b/test/rlhc.d/case/targs1_java.java-J-T0--var-backend.exp
index b5d1e101..b5d1e101 100644
--- a/test/cases/rlhc.d/case/targs1_java.java-J-T0--var-backend.exp
+++ b/test/rlhc.d/case/targs1_java.java-J-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_java.java-J-T0--var-backend.in b/test/rlhc.d/case/targs1_java.java-J-T0--var-backend.in
index a256c626..a256c626 100644
--- a/test/cases/rlhc.d/case/targs1_java.java-J-T0--var-backend.in
+++ b/test/rlhc.d/case/targs1_java.java-J-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_java.java-J-T1--goto-backend.exp b/test/rlhc.d/case/targs1_java.java-J-T1--goto-backend.exp
index 8b81bc28..8b81bc28 100644
--- a/test/cases/rlhc.d/case/targs1_java.java-J-T1--goto-backend.exp
+++ b/test/rlhc.d/case/targs1_java.java-J-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_java.java-J-T1--goto-backend.in b/test/rlhc.d/case/targs1_java.java-J-T1--goto-backend.in
index 375fd7c3..375fd7c3 100644
--- a/test/cases/rlhc.d/case/targs1_java.java-J-T1--goto-backend.in
+++ b/test/rlhc.d/case/targs1_java.java-J-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_java.java-J-T1--var-backend.exp b/test/rlhc.d/case/targs1_java.java-J-T1--var-backend.exp
index 9bb10215..9bb10215 100644
--- a/test/cases/rlhc.d/case/targs1_java.java-J-T1--var-backend.exp
+++ b/test/rlhc.d/case/targs1_java.java-J-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_java.java-J-T1--var-backend.in b/test/rlhc.d/case/targs1_java.java-J-T1--var-backend.in
index b1604411..b1604411 100644
--- a/test/cases/rlhc.d/case/targs1_java.java-J-T1--var-backend.in
+++ b/test/rlhc.d/case/targs1_java.java-J-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_julia.jl-Y-F0--var-backend.exp b/test/rlhc.d/case/targs1_julia.jl-Y-F0--var-backend.exp
index 23ec373f..23ec373f 100644
--- a/test/cases/rlhc.d/case/targs1_julia.jl-Y-F0--var-backend.exp
+++ b/test/rlhc.d/case/targs1_julia.jl-Y-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_julia.jl-Y-F0--var-backend.in b/test/rlhc.d/case/targs1_julia.jl-Y-F0--var-backend.in
index 2370fe89..2370fe89 100644
--- a/test/cases/rlhc.d/case/targs1_julia.jl-Y-F0--var-backend.in
+++ b/test/rlhc.d/case/targs1_julia.jl-Y-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_julia.jl-Y-F1--var-backend.exp b/test/rlhc.d/case/targs1_julia.jl-Y-F1--var-backend.exp
index 2ba87d05..2ba87d05 100644
--- a/test/cases/rlhc.d/case/targs1_julia.jl-Y-F1--var-backend.exp
+++ b/test/rlhc.d/case/targs1_julia.jl-Y-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_julia.jl-Y-F1--var-backend.in b/test/rlhc.d/case/targs1_julia.jl-Y-F1--var-backend.in
index 61362c81..61362c81 100644
--- a/test/cases/rlhc.d/case/targs1_julia.jl-Y-F1--var-backend.in
+++ b/test/rlhc.d/case/targs1_julia.jl-Y-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_julia.jl-Y-T0--var-backend.exp b/test/rlhc.d/case/targs1_julia.jl-Y-T0--var-backend.exp
index 9ff77ecd..9ff77ecd 100644
--- a/test/cases/rlhc.d/case/targs1_julia.jl-Y-T0--var-backend.exp
+++ b/test/rlhc.d/case/targs1_julia.jl-Y-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_julia.jl-Y-T0--var-backend.in b/test/rlhc.d/case/targs1_julia.jl-Y-T0--var-backend.in
index 5f9788fa..5f9788fa 100644
--- a/test/cases/rlhc.d/case/targs1_julia.jl-Y-T0--var-backend.in
+++ b/test/rlhc.d/case/targs1_julia.jl-Y-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_julia.jl-Y-T1--var-backend.exp b/test/rlhc.d/case/targs1_julia.jl-Y-T1--var-backend.exp
index c8a2463a..c8a2463a 100644
--- a/test/cases/rlhc.d/case/targs1_julia.jl-Y-T1--var-backend.exp
+++ b/test/rlhc.d/case/targs1_julia.jl-Y-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_julia.jl-Y-T1--var-backend.in b/test/rlhc.d/case/targs1_julia.jl-Y-T1--var-backend.in
index 55b4d184..55b4d184 100644
--- a/test/cases/rlhc.d/case/targs1_julia.jl-Y-T1--var-backend.in
+++ b/test/rlhc.d/case/targs1_julia.jl-Y-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_ocaml.ml-O-F0--var-backend.exp b/test/rlhc.d/case/targs1_ocaml.ml-O-F0--var-backend.exp
index 53c410e0..53c410e0 100644
--- a/test/cases/rlhc.d/case/targs1_ocaml.ml-O-F0--var-backend.exp
+++ b/test/rlhc.d/case/targs1_ocaml.ml-O-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_ocaml.ml-O-F0--var-backend.in b/test/rlhc.d/case/targs1_ocaml.ml-O-F0--var-backend.in
index d29027cf..d29027cf 100644
--- a/test/cases/rlhc.d/case/targs1_ocaml.ml-O-F0--var-backend.in
+++ b/test/rlhc.d/case/targs1_ocaml.ml-O-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_ocaml.ml-O-F1--var-backend.exp b/test/rlhc.d/case/targs1_ocaml.ml-O-F1--var-backend.exp
index 1b6c7db8..1b6c7db8 100644
--- a/test/cases/rlhc.d/case/targs1_ocaml.ml-O-F1--var-backend.exp
+++ b/test/rlhc.d/case/targs1_ocaml.ml-O-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_ocaml.ml-O-F1--var-backend.in b/test/rlhc.d/case/targs1_ocaml.ml-O-F1--var-backend.in
index ff046c33..ff046c33 100644
--- a/test/cases/rlhc.d/case/targs1_ocaml.ml-O-F1--var-backend.in
+++ b/test/rlhc.d/case/targs1_ocaml.ml-O-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_ocaml.ml-O-T0--var-backend.exp b/test/rlhc.d/case/targs1_ocaml.ml-O-T0--var-backend.exp
index fb5cc177..fb5cc177 100644
--- a/test/cases/rlhc.d/case/targs1_ocaml.ml-O-T0--var-backend.exp
+++ b/test/rlhc.d/case/targs1_ocaml.ml-O-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_ocaml.ml-O-T0--var-backend.in b/test/rlhc.d/case/targs1_ocaml.ml-O-T0--var-backend.in
index 8eff90f8..8eff90f8 100644
--- a/test/cases/rlhc.d/case/targs1_ocaml.ml-O-T0--var-backend.in
+++ b/test/rlhc.d/case/targs1_ocaml.ml-O-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_ocaml.ml-O-T1--var-backend.exp b/test/rlhc.d/case/targs1_ocaml.ml-O-T1--var-backend.exp
index a72ea23a..a72ea23a 100644
--- a/test/cases/rlhc.d/case/targs1_ocaml.ml-O-T1--var-backend.exp
+++ b/test/rlhc.d/case/targs1_ocaml.ml-O-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_ocaml.ml-O-T1--var-backend.in b/test/rlhc.d/case/targs1_ocaml.ml-O-T1--var-backend.in
index 3fc66654..3fc66654 100644
--- a/test/cases/rlhc.d/case/targs1_ocaml.ml-O-T1--var-backend.in
+++ b/test/rlhc.d/case/targs1_ocaml.ml-O-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_ruby.rb-R-F0--var-backend.exp b/test/rlhc.d/case/targs1_ruby.rb-R-F0--var-backend.exp
index 0eb12b65..0eb12b65 100644
--- a/test/cases/rlhc.d/case/targs1_ruby.rb-R-F0--var-backend.exp
+++ b/test/rlhc.d/case/targs1_ruby.rb-R-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_ruby.rb-R-F0--var-backend.in b/test/rlhc.d/case/targs1_ruby.rb-R-F0--var-backend.in
index 8141a48f..8141a48f 100644
--- a/test/cases/rlhc.d/case/targs1_ruby.rb-R-F0--var-backend.in
+++ b/test/rlhc.d/case/targs1_ruby.rb-R-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_ruby.rb-R-F1--var-backend.exp b/test/rlhc.d/case/targs1_ruby.rb-R-F1--var-backend.exp
index 46c15254..46c15254 100644
--- a/test/cases/rlhc.d/case/targs1_ruby.rb-R-F1--var-backend.exp
+++ b/test/rlhc.d/case/targs1_ruby.rb-R-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_ruby.rb-R-F1--var-backend.in b/test/rlhc.d/case/targs1_ruby.rb-R-F1--var-backend.in
index 42a0f88b..42a0f88b 100644
--- a/test/cases/rlhc.d/case/targs1_ruby.rb-R-F1--var-backend.in
+++ b/test/rlhc.d/case/targs1_ruby.rb-R-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_ruby.rb-R-T0--var-backend.exp b/test/rlhc.d/case/targs1_ruby.rb-R-T0--var-backend.exp
index b3096dfe..b3096dfe 100644
--- a/test/cases/rlhc.d/case/targs1_ruby.rb-R-T0--var-backend.exp
+++ b/test/rlhc.d/case/targs1_ruby.rb-R-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_ruby.rb-R-T0--var-backend.in b/test/rlhc.d/case/targs1_ruby.rb-R-T0--var-backend.in
index 83127c61..83127c61 100644
--- a/test/cases/rlhc.d/case/targs1_ruby.rb-R-T0--var-backend.in
+++ b/test/rlhc.d/case/targs1_ruby.rb-R-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_ruby.rb-R-T1--var-backend.exp b/test/rlhc.d/case/targs1_ruby.rb-R-T1--var-backend.exp
index 4db2edaa..4db2edaa 100644
--- a/test/cases/rlhc.d/case/targs1_ruby.rb-R-T1--var-backend.exp
+++ b/test/rlhc.d/case/targs1_ruby.rb-R-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_ruby.rb-R-T1--var-backend.in b/test/rlhc.d/case/targs1_ruby.rb-R-T1--var-backend.in
index 4c46dea1..4c46dea1 100644
--- a/test/cases/rlhc.d/case/targs1_ruby.rb-R-T1--var-backend.in
+++ b/test/rlhc.d/case/targs1_ruby.rb-R-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_rust.rs-U-F0--var-backend.exp b/test/rlhc.d/case/targs1_rust.rs-U-F0--var-backend.exp
index 83f4ef49..83f4ef49 100644
--- a/test/cases/rlhc.d/case/targs1_rust.rs-U-F0--var-backend.exp
+++ b/test/rlhc.d/case/targs1_rust.rs-U-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_rust.rs-U-F0--var-backend.in b/test/rlhc.d/case/targs1_rust.rs-U-F0--var-backend.in
index e299bd45..e299bd45 100644
--- a/test/cases/rlhc.d/case/targs1_rust.rs-U-F0--var-backend.in
+++ b/test/rlhc.d/case/targs1_rust.rs-U-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_rust.rs-U-F1--var-backend.exp b/test/rlhc.d/case/targs1_rust.rs-U-F1--var-backend.exp
index efa32ef4..efa32ef4 100644
--- a/test/cases/rlhc.d/case/targs1_rust.rs-U-F1--var-backend.exp
+++ b/test/rlhc.d/case/targs1_rust.rs-U-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_rust.rs-U-F1--var-backend.in b/test/rlhc.d/case/targs1_rust.rs-U-F1--var-backend.in
index 00860ecb..00860ecb 100644
--- a/test/cases/rlhc.d/case/targs1_rust.rs-U-F1--var-backend.in
+++ b/test/rlhc.d/case/targs1_rust.rs-U-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_rust.rs-U-T0--var-backend.exp b/test/rlhc.d/case/targs1_rust.rs-U-T0--var-backend.exp
index e554f69a..e554f69a 100644
--- a/test/cases/rlhc.d/case/targs1_rust.rs-U-T0--var-backend.exp
+++ b/test/rlhc.d/case/targs1_rust.rs-U-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_rust.rs-U-T0--var-backend.in b/test/rlhc.d/case/targs1_rust.rs-U-T0--var-backend.in
index ae347a1b..ae347a1b 100644
--- a/test/cases/rlhc.d/case/targs1_rust.rs-U-T0--var-backend.in
+++ b/test/rlhc.d/case/targs1_rust.rs-U-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/targs1_rust.rs-U-T1--var-backend.exp b/test/rlhc.d/case/targs1_rust.rs-U-T1--var-backend.exp
index 09b7fdb7..09b7fdb7 100644
--- a/test/cases/rlhc.d/case/targs1_rust.rs-U-T1--var-backend.exp
+++ b/test/rlhc.d/case/targs1_rust.rs-U-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/targs1_rust.rs-U-T1--var-backend.in b/test/rlhc.d/case/targs1_rust.rs-U-T1--var-backend.in
index 19d2fdf5..19d2fdf5 100644
--- a/test/cases/rlhc.d/case/targs1_rust.rs-U-T1--var-backend.in
+++ b/test/rlhc.d/case/targs1_rust.rs-U-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/tofrom2.c-C-F0--goto-backend.exp b/test/rlhc.d/case/tofrom2.c-C-F0--goto-backend.exp
index a1df48b0..a1df48b0 100644
--- a/test/cases/rlhc.d/case/tofrom2.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/tofrom2.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/tofrom2.c-C-F0--goto-backend.in b/test/rlhc.d/case/tofrom2.c-C-F0--goto-backend.in
index 76f90938..76f90938 100644
--- a/test/cases/rlhc.d/case/tofrom2.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/tofrom2.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/tofrom2.c-C-F0--var-backend.exp b/test/rlhc.d/case/tofrom2.c-C-F0--var-backend.exp
index a4ce673a..a4ce673a 100644
--- a/test/cases/rlhc.d/case/tofrom2.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/tofrom2.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/tofrom2.c-C-F0--var-backend.in b/test/rlhc.d/case/tofrom2.c-C-F0--var-backend.in
index fc9ae9ee..fc9ae9ee 100644
--- a/test/cases/rlhc.d/case/tofrom2.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/tofrom2.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/tofrom2.c-C-F1--goto-backend.exp b/test/rlhc.d/case/tofrom2.c-C-F1--goto-backend.exp
index 4df2171f..4df2171f 100644
--- a/test/cases/rlhc.d/case/tofrom2.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/tofrom2.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/tofrom2.c-C-F1--goto-backend.in b/test/rlhc.d/case/tofrom2.c-C-F1--goto-backend.in
index caf026a8..caf026a8 100644
--- a/test/cases/rlhc.d/case/tofrom2.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/tofrom2.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/tofrom2.c-C-F1--var-backend.exp b/test/rlhc.d/case/tofrom2.c-C-F1--var-backend.exp
index 1451917a..1451917a 100644
--- a/test/cases/rlhc.d/case/tofrom2.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/tofrom2.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/tofrom2.c-C-F1--var-backend.in b/test/rlhc.d/case/tofrom2.c-C-F1--var-backend.in
index 6fbc4ed3..6fbc4ed3 100644
--- a/test/cases/rlhc.d/case/tofrom2.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/tofrom2.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/tofrom2.c-C-G0--goto-backend.exp b/test/rlhc.d/case/tofrom2.c-C-G0--goto-backend.exp
index 440841d7..440841d7 100644
--- a/test/cases/rlhc.d/case/tofrom2.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/tofrom2.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/tofrom2.c-C-G0--goto-backend.in b/test/rlhc.d/case/tofrom2.c-C-G0--goto-backend.in
index 59850a83..59850a83 100644
--- a/test/cases/rlhc.d/case/tofrom2.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/tofrom2.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/tofrom2.c-C-G1--goto-backend.exp b/test/rlhc.d/case/tofrom2.c-C-G1--goto-backend.exp
index c1a62904..c1a62904 100644
--- a/test/cases/rlhc.d/case/tofrom2.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/tofrom2.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/tofrom2.c-C-G1--goto-backend.in b/test/rlhc.d/case/tofrom2.c-C-G1--goto-backend.in
index 556064d6..556064d6 100644
--- a/test/cases/rlhc.d/case/tofrom2.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/tofrom2.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/tofrom2.c-C-G2--goto-backend.exp b/test/rlhc.d/case/tofrom2.c-C-G2--goto-backend.exp
index 4509650d..4509650d 100644
--- a/test/cases/rlhc.d/case/tofrom2.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/tofrom2.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/tofrom2.c-C-G2--goto-backend.in b/test/rlhc.d/case/tofrom2.c-C-G2--goto-backend.in
index f407fcdf..f407fcdf 100644
--- a/test/cases/rlhc.d/case/tofrom2.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/tofrom2.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/tofrom2.c-C-T0--goto-backend.exp b/test/rlhc.d/case/tofrom2.c-C-T0--goto-backend.exp
index 32f20993..32f20993 100644
--- a/test/cases/rlhc.d/case/tofrom2.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/tofrom2.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/tofrom2.c-C-T0--goto-backend.in b/test/rlhc.d/case/tofrom2.c-C-T0--goto-backend.in
index 7d7d6a23..7d7d6a23 100644
--- a/test/cases/rlhc.d/case/tofrom2.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/tofrom2.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/tofrom2.c-C-T0--var-backend.exp b/test/rlhc.d/case/tofrom2.c-C-T0--var-backend.exp
index 1feacfac..1feacfac 100644
--- a/test/cases/rlhc.d/case/tofrom2.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/tofrom2.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/tofrom2.c-C-T0--var-backend.in b/test/rlhc.d/case/tofrom2.c-C-T0--var-backend.in
index ce79ff20..ce79ff20 100644
--- a/test/cases/rlhc.d/case/tofrom2.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/tofrom2.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/tofrom2.c-C-T1--goto-backend.exp b/test/rlhc.d/case/tofrom2.c-C-T1--goto-backend.exp
index 7f065847..7f065847 100644
--- a/test/cases/rlhc.d/case/tofrom2.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/tofrom2.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/tofrom2.c-C-T1--goto-backend.in b/test/rlhc.d/case/tofrom2.c-C-T1--goto-backend.in
index c0850716..c0850716 100644
--- a/test/cases/rlhc.d/case/tofrom2.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/tofrom2.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/tofrom2.c-C-T1--var-backend.exp b/test/rlhc.d/case/tofrom2.c-C-T1--var-backend.exp
index 068476e6..068476e6 100644
--- a/test/cases/rlhc.d/case/tofrom2.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/tofrom2.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/tofrom2.c-C-T1--var-backend.in b/test/rlhc.d/case/tofrom2.c-C-T1--var-backend.in
index 024c23c5..024c23c5 100644
--- a/test/cases/rlhc.d/case/tofrom2.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/tofrom2.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/tokstart1.cpp-C-F0--goto-backend.exp b/test/rlhc.d/case/tokstart1.cpp-C-F0--goto-backend.exp
index 4f527a72..4f527a72 100644
--- a/test/cases/rlhc.d/case/tokstart1.cpp-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/tokstart1.cpp-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/tokstart1.cpp-C-F0--goto-backend.in b/test/rlhc.d/case/tokstart1.cpp-C-F0--goto-backend.in
index e8fcfee0..e8fcfee0 100644
--- a/test/cases/rlhc.d/case/tokstart1.cpp-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/tokstart1.cpp-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/tokstart1.cpp-C-F0--var-backend.exp b/test/rlhc.d/case/tokstart1.cpp-C-F0--var-backend.exp
index e96e21d3..e96e21d3 100644
--- a/test/cases/rlhc.d/case/tokstart1.cpp-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/tokstart1.cpp-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/tokstart1.cpp-C-F0--var-backend.in b/test/rlhc.d/case/tokstart1.cpp-C-F0--var-backend.in
index cfb75b56..cfb75b56 100644
--- a/test/cases/rlhc.d/case/tokstart1.cpp-C-F0--var-backend.in
+++ b/test/rlhc.d/case/tokstart1.cpp-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/tokstart1.cpp-C-F1--goto-backend.exp b/test/rlhc.d/case/tokstart1.cpp-C-F1--goto-backend.exp
index 385e7899..385e7899 100644
--- a/test/cases/rlhc.d/case/tokstart1.cpp-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/tokstart1.cpp-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/tokstart1.cpp-C-F1--goto-backend.in b/test/rlhc.d/case/tokstart1.cpp-C-F1--goto-backend.in
index 3233a5b9..3233a5b9 100644
--- a/test/cases/rlhc.d/case/tokstart1.cpp-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/tokstart1.cpp-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/tokstart1.cpp-C-F1--var-backend.exp b/test/rlhc.d/case/tokstart1.cpp-C-F1--var-backend.exp
index 5ebae2d3..5ebae2d3 100644
--- a/test/cases/rlhc.d/case/tokstart1.cpp-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/tokstart1.cpp-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/tokstart1.cpp-C-F1--var-backend.in b/test/rlhc.d/case/tokstart1.cpp-C-F1--var-backend.in
index c167b8dd..c167b8dd 100644
--- a/test/cases/rlhc.d/case/tokstart1.cpp-C-F1--var-backend.in
+++ b/test/rlhc.d/case/tokstart1.cpp-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/tokstart1.cpp-C-G0--goto-backend.exp b/test/rlhc.d/case/tokstart1.cpp-C-G0--goto-backend.exp
index 957063e6..957063e6 100644
--- a/test/cases/rlhc.d/case/tokstart1.cpp-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/tokstart1.cpp-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/tokstart1.cpp-C-G0--goto-backend.in b/test/rlhc.d/case/tokstart1.cpp-C-G0--goto-backend.in
index fe982c8c..fe982c8c 100644
--- a/test/cases/rlhc.d/case/tokstart1.cpp-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/tokstart1.cpp-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/tokstart1.cpp-C-G1--goto-backend.exp b/test/rlhc.d/case/tokstart1.cpp-C-G1--goto-backend.exp
index ce0401c9..ce0401c9 100644
--- a/test/cases/rlhc.d/case/tokstart1.cpp-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/tokstart1.cpp-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/tokstart1.cpp-C-G1--goto-backend.in b/test/rlhc.d/case/tokstart1.cpp-C-G1--goto-backend.in
index bc0bcb7d..bc0bcb7d 100644
--- a/test/cases/rlhc.d/case/tokstart1.cpp-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/tokstart1.cpp-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/tokstart1.cpp-C-G2--goto-backend.exp b/test/rlhc.d/case/tokstart1.cpp-C-G2--goto-backend.exp
index 2998afbd..2998afbd 100644
--- a/test/cases/rlhc.d/case/tokstart1.cpp-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/tokstart1.cpp-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/tokstart1.cpp-C-G2--goto-backend.in b/test/rlhc.d/case/tokstart1.cpp-C-G2--goto-backend.in
index 7c0afe1f..7c0afe1f 100644
--- a/test/cases/rlhc.d/case/tokstart1.cpp-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/tokstart1.cpp-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/tokstart1.cpp-C-T0--goto-backend.exp b/test/rlhc.d/case/tokstart1.cpp-C-T0--goto-backend.exp
index cc51aaf7..cc51aaf7 100644
--- a/test/cases/rlhc.d/case/tokstart1.cpp-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/tokstart1.cpp-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/tokstart1.cpp-C-T0--goto-backend.in b/test/rlhc.d/case/tokstart1.cpp-C-T0--goto-backend.in
index c9642d3f..c9642d3f 100644
--- a/test/cases/rlhc.d/case/tokstart1.cpp-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/tokstart1.cpp-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/tokstart1.cpp-C-T0--var-backend.exp b/test/rlhc.d/case/tokstart1.cpp-C-T0--var-backend.exp
index eb69f438..eb69f438 100644
--- a/test/cases/rlhc.d/case/tokstart1.cpp-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/tokstart1.cpp-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/tokstart1.cpp-C-T0--var-backend.in b/test/rlhc.d/case/tokstart1.cpp-C-T0--var-backend.in
index a8b3d80e..a8b3d80e 100644
--- a/test/cases/rlhc.d/case/tokstart1.cpp-C-T0--var-backend.in
+++ b/test/rlhc.d/case/tokstart1.cpp-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/tokstart1.cpp-C-T1--goto-backend.exp b/test/rlhc.d/case/tokstart1.cpp-C-T1--goto-backend.exp
index e1fa67e4..e1fa67e4 100644
--- a/test/cases/rlhc.d/case/tokstart1.cpp-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/tokstart1.cpp-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/tokstart1.cpp-C-T1--goto-backend.in b/test/rlhc.d/case/tokstart1.cpp-C-T1--goto-backend.in
index 435b312c..435b312c 100644
--- a/test/cases/rlhc.d/case/tokstart1.cpp-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/tokstart1.cpp-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/tokstart1.cpp-C-T1--var-backend.exp b/test/rlhc.d/case/tokstart1.cpp-C-T1--var-backend.exp
index d06500fd..d06500fd 100644
--- a/test/cases/rlhc.d/case/tokstart1.cpp-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/tokstart1.cpp-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/tokstart1.cpp-C-T1--var-backend.in b/test/rlhc.d/case/tokstart1.cpp-C-T1--var-backend.in
index 1bd3223f..1bd3223f 100644
--- a/test/cases/rlhc.d/case/tokstart1.cpp-C-T1--var-backend.in
+++ b/test/rlhc.d/case/tokstart1.cpp-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/union.cpp-C-F0--goto-backend.exp b/test/rlhc.d/case/union.cpp-C-F0--goto-backend.exp
index c0aa7cbc..c0aa7cbc 100644
--- a/test/cases/rlhc.d/case/union.cpp-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/union.cpp-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/union.cpp-C-F0--goto-backend.in b/test/rlhc.d/case/union.cpp-C-F0--goto-backend.in
index a093eb6d..a093eb6d 100644
--- a/test/cases/rlhc.d/case/union.cpp-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/union.cpp-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/union.cpp-C-F0--var-backend.exp b/test/rlhc.d/case/union.cpp-C-F0--var-backend.exp
index a65c0587..a65c0587 100644
--- a/test/cases/rlhc.d/case/union.cpp-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/union.cpp-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/union.cpp-C-F0--var-backend.in b/test/rlhc.d/case/union.cpp-C-F0--var-backend.in
index 7332f181..7332f181 100644
--- a/test/cases/rlhc.d/case/union.cpp-C-F0--var-backend.in
+++ b/test/rlhc.d/case/union.cpp-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/union.cpp-C-F1--goto-backend.exp b/test/rlhc.d/case/union.cpp-C-F1--goto-backend.exp
index 80993855..80993855 100644
--- a/test/cases/rlhc.d/case/union.cpp-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/union.cpp-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/union.cpp-C-F1--goto-backend.in b/test/rlhc.d/case/union.cpp-C-F1--goto-backend.in
index 1dc0fbd8..1dc0fbd8 100644
--- a/test/cases/rlhc.d/case/union.cpp-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/union.cpp-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/union.cpp-C-F1--var-backend.exp b/test/rlhc.d/case/union.cpp-C-F1--var-backend.exp
index 9c49500f..9c49500f 100644
--- a/test/cases/rlhc.d/case/union.cpp-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/union.cpp-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/union.cpp-C-F1--var-backend.in b/test/rlhc.d/case/union.cpp-C-F1--var-backend.in
index 6cc59b9a..6cc59b9a 100644
--- a/test/cases/rlhc.d/case/union.cpp-C-F1--var-backend.in
+++ b/test/rlhc.d/case/union.cpp-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/union.cpp-C-G0--goto-backend.exp b/test/rlhc.d/case/union.cpp-C-G0--goto-backend.exp
index 6c940802..6c940802 100644
--- a/test/cases/rlhc.d/case/union.cpp-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/union.cpp-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/union.cpp-C-G0--goto-backend.in b/test/rlhc.d/case/union.cpp-C-G0--goto-backend.in
index dc18a7ef..dc18a7ef 100644
--- a/test/cases/rlhc.d/case/union.cpp-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/union.cpp-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/union.cpp-C-G1--goto-backend.exp b/test/rlhc.d/case/union.cpp-C-G1--goto-backend.exp
index 000022a6..000022a6 100644
--- a/test/cases/rlhc.d/case/union.cpp-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/union.cpp-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/union.cpp-C-G1--goto-backend.in b/test/rlhc.d/case/union.cpp-C-G1--goto-backend.in
index 00591362..00591362 100644
--- a/test/cases/rlhc.d/case/union.cpp-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/union.cpp-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/union.cpp-C-G2--goto-backend.exp b/test/rlhc.d/case/union.cpp-C-G2--goto-backend.exp
index dd6e7207..dd6e7207 100644
--- a/test/cases/rlhc.d/case/union.cpp-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/union.cpp-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/union.cpp-C-G2--goto-backend.in b/test/rlhc.d/case/union.cpp-C-G2--goto-backend.in
index a4d6bbd5..a4d6bbd5 100644
--- a/test/cases/rlhc.d/case/union.cpp-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/union.cpp-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/union.cpp-C-T0--goto-backend.exp b/test/rlhc.d/case/union.cpp-C-T0--goto-backend.exp
index be26c0fd..be26c0fd 100644
--- a/test/cases/rlhc.d/case/union.cpp-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/union.cpp-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/union.cpp-C-T0--goto-backend.in b/test/rlhc.d/case/union.cpp-C-T0--goto-backend.in
index e0f64df6..e0f64df6 100644
--- a/test/cases/rlhc.d/case/union.cpp-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/union.cpp-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/union.cpp-C-T0--var-backend.exp b/test/rlhc.d/case/union.cpp-C-T0--var-backend.exp
index 40ec6cd5..40ec6cd5 100644
--- a/test/cases/rlhc.d/case/union.cpp-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/union.cpp-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/union.cpp-C-T0--var-backend.in b/test/rlhc.d/case/union.cpp-C-T0--var-backend.in
index 85e9a669..85e9a669 100644
--- a/test/cases/rlhc.d/case/union.cpp-C-T0--var-backend.in
+++ b/test/rlhc.d/case/union.cpp-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/union.cpp-C-T1--goto-backend.exp b/test/rlhc.d/case/union.cpp-C-T1--goto-backend.exp
index fc5b4cb8..fc5b4cb8 100644
--- a/test/cases/rlhc.d/case/union.cpp-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/union.cpp-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/union.cpp-C-T1--goto-backend.in b/test/rlhc.d/case/union.cpp-C-T1--goto-backend.in
index ba40a99b..ba40a99b 100644
--- a/test/cases/rlhc.d/case/union.cpp-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/union.cpp-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/union.cpp-C-T1--var-backend.exp b/test/rlhc.d/case/union.cpp-C-T1--var-backend.exp
index 3d2ce400..3d2ce400 100644
--- a/test/cases/rlhc.d/case/union.cpp-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/union.cpp-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/union.cpp-C-T1--var-backend.in b/test/rlhc.d/case/union.cpp-C-T1--var-backend.in
index add33768..add33768 100644
--- a/test/cases/rlhc.d/case/union.cpp-C-T1--var-backend.in
+++ b/test/rlhc.d/case/union.cpp-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/url1.ml-O-F0--var-backend.exp b/test/rlhc.d/case/url1.ml-O-F0--var-backend.exp
index f5987a6a..f5987a6a 100644
--- a/test/cases/rlhc.d/case/url1.ml-O-F0--var-backend.exp
+++ b/test/rlhc.d/case/url1.ml-O-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/url1.ml-O-F0--var-backend.in b/test/rlhc.d/case/url1.ml-O-F0--var-backend.in
index b414930e..b414930e 100644
--- a/test/cases/rlhc.d/case/url1.ml-O-F0--var-backend.in
+++ b/test/rlhc.d/case/url1.ml-O-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/url1.ml-O-F1--var-backend.exp b/test/rlhc.d/case/url1.ml-O-F1--var-backend.exp
index 57d0f6a2..57d0f6a2 100644
--- a/test/cases/rlhc.d/case/url1.ml-O-F1--var-backend.exp
+++ b/test/rlhc.d/case/url1.ml-O-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/url1.ml-O-F1--var-backend.in b/test/rlhc.d/case/url1.ml-O-F1--var-backend.in
index 676e2597..676e2597 100644
--- a/test/cases/rlhc.d/case/url1.ml-O-F1--var-backend.in
+++ b/test/rlhc.d/case/url1.ml-O-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/url1.ml-O-T0--var-backend.exp b/test/rlhc.d/case/url1.ml-O-T0--var-backend.exp
index 95dff1e7..95dff1e7 100644
--- a/test/cases/rlhc.d/case/url1.ml-O-T0--var-backend.exp
+++ b/test/rlhc.d/case/url1.ml-O-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/url1.ml-O-T0--var-backend.in b/test/rlhc.d/case/url1.ml-O-T0--var-backend.in
index a91803e2..a91803e2 100644
--- a/test/cases/rlhc.d/case/url1.ml-O-T0--var-backend.in
+++ b/test/rlhc.d/case/url1.ml-O-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/url1.ml-O-T1--var-backend.exp b/test/rlhc.d/case/url1.ml-O-T1--var-backend.exp
index 2861a889..2861a889 100644
--- a/test/cases/rlhc.d/case/url1.ml-O-T1--var-backend.exp
+++ b/test/rlhc.d/case/url1.ml-O-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/url1.ml-O-T1--var-backend.in b/test/rlhc.d/case/url1.ml-O-T1--var-backend.in
index 8dc50fa9..8dc50fa9 100644
--- a/test/cases/rlhc.d/case/url1.ml-O-T1--var-backend.in
+++ b/test/rlhc.d/case/url1.ml-O-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/xml.cpp-C-T0--goto-backend.exp b/test/rlhc.d/case/xml.cpp-C-T0--goto-backend.exp
index 7d624fd6..7d624fd6 100644
--- a/test/cases/rlhc.d/case/xml.cpp-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/xml.cpp-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/xml.cpp-C-T0--goto-backend.in b/test/rlhc.d/case/xml.cpp-C-T0--goto-backend.in
index 57bf97ea..57bf97ea 100644
--- a/test/cases/rlhc.d/case/xml.cpp-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/xml.cpp-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/xml.cpp-C-T0--var-backend.exp b/test/rlhc.d/case/xml.cpp-C-T0--var-backend.exp
index 7cf308b6..7cf308b6 100644
--- a/test/cases/rlhc.d/case/xml.cpp-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/xml.cpp-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/xml.cpp-C-T0--var-backend.in b/test/rlhc.d/case/xml.cpp-C-T0--var-backend.in
index f1e6d576..f1e6d576 100644
--- a/test/cases/rlhc.d/case/xml.cpp-C-T0--var-backend.in
+++ b/test/rlhc.d/case/xml.cpp-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/xml.cpp-C-T1--goto-backend.exp b/test/rlhc.d/case/xml.cpp-C-T1--goto-backend.exp
index da5ad597..da5ad597 100644
--- a/test/cases/rlhc.d/case/xml.cpp-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/xml.cpp-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/xml.cpp-C-T1--goto-backend.in b/test/rlhc.d/case/xml.cpp-C-T1--goto-backend.in
index 81333970..81333970 100644
--- a/test/cases/rlhc.d/case/xml.cpp-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/xml.cpp-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/xml.cpp-C-T1--var-backend.exp b/test/rlhc.d/case/xml.cpp-C-T1--var-backend.exp
index 97c816bf..97c816bf 100644
--- a/test/cases/rlhc.d/case/xml.cpp-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/xml.cpp-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/xml.cpp-C-T1--var-backend.in b/test/rlhc.d/case/xml.cpp-C-T1--var-backend.in
index d0089796..d0089796 100644
--- a/test/cases/rlhc.d/case/xml.cpp-C-T1--var-backend.in
+++ b/test/rlhc.d/case/xml.cpp-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_c.c-C-F0--goto-backend.exp b/test/rlhc.d/case/zlen1_c.c-C-F0--goto-backend.exp
index 013a75ed..013a75ed 100644
--- a/test/cases/rlhc.d/case/zlen1_c.c-C-F0--goto-backend.exp
+++ b/test/rlhc.d/case/zlen1_c.c-C-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_c.c-C-F0--goto-backend.in b/test/rlhc.d/case/zlen1_c.c-C-F0--goto-backend.in
index 01f38a45..01f38a45 100644
--- a/test/cases/rlhc.d/case/zlen1_c.c-C-F0--goto-backend.in
+++ b/test/rlhc.d/case/zlen1_c.c-C-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_c.c-C-F0--var-backend.exp b/test/rlhc.d/case/zlen1_c.c-C-F0--var-backend.exp
index 569552a0..569552a0 100644
--- a/test/cases/rlhc.d/case/zlen1_c.c-C-F0--var-backend.exp
+++ b/test/rlhc.d/case/zlen1_c.c-C-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_c.c-C-F0--var-backend.in b/test/rlhc.d/case/zlen1_c.c-C-F0--var-backend.in
index 1894144e..1894144e 100644
--- a/test/cases/rlhc.d/case/zlen1_c.c-C-F0--var-backend.in
+++ b/test/rlhc.d/case/zlen1_c.c-C-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_c.c-C-F1--goto-backend.exp b/test/rlhc.d/case/zlen1_c.c-C-F1--goto-backend.exp
index 70ede828..70ede828 100644
--- a/test/cases/rlhc.d/case/zlen1_c.c-C-F1--goto-backend.exp
+++ b/test/rlhc.d/case/zlen1_c.c-C-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_c.c-C-F1--goto-backend.in b/test/rlhc.d/case/zlen1_c.c-C-F1--goto-backend.in
index c75f35a6..c75f35a6 100644
--- a/test/cases/rlhc.d/case/zlen1_c.c-C-F1--goto-backend.in
+++ b/test/rlhc.d/case/zlen1_c.c-C-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_c.c-C-F1--var-backend.exp b/test/rlhc.d/case/zlen1_c.c-C-F1--var-backend.exp
index 569552a0..569552a0 100644
--- a/test/cases/rlhc.d/case/zlen1_c.c-C-F1--var-backend.exp
+++ b/test/rlhc.d/case/zlen1_c.c-C-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_c.c-C-F1--var-backend.in b/test/rlhc.d/case/zlen1_c.c-C-F1--var-backend.in
index 1894144e..1894144e 100644
--- a/test/cases/rlhc.d/case/zlen1_c.c-C-F1--var-backend.in
+++ b/test/rlhc.d/case/zlen1_c.c-C-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_c.c-C-G0--goto-backend.exp b/test/rlhc.d/case/zlen1_c.c-C-G0--goto-backend.exp
index 57e68d5e..57e68d5e 100644
--- a/test/cases/rlhc.d/case/zlen1_c.c-C-G0--goto-backend.exp
+++ b/test/rlhc.d/case/zlen1_c.c-C-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_c.c-C-G0--goto-backend.in b/test/rlhc.d/case/zlen1_c.c-C-G0--goto-backend.in
index 5d6cccc8..5d6cccc8 100644
--- a/test/cases/rlhc.d/case/zlen1_c.c-C-G0--goto-backend.in
+++ b/test/rlhc.d/case/zlen1_c.c-C-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_c.c-C-G1--goto-backend.exp b/test/rlhc.d/case/zlen1_c.c-C-G1--goto-backend.exp
index c3655813..c3655813 100644
--- a/test/cases/rlhc.d/case/zlen1_c.c-C-G1--goto-backend.exp
+++ b/test/rlhc.d/case/zlen1_c.c-C-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_c.c-C-G1--goto-backend.in b/test/rlhc.d/case/zlen1_c.c-C-G1--goto-backend.in
index 2918cea5..2918cea5 100644
--- a/test/cases/rlhc.d/case/zlen1_c.c-C-G1--goto-backend.in
+++ b/test/rlhc.d/case/zlen1_c.c-C-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_c.c-C-G2--goto-backend.exp b/test/rlhc.d/case/zlen1_c.c-C-G2--goto-backend.exp
index ac091587..ac091587 100644
--- a/test/cases/rlhc.d/case/zlen1_c.c-C-G2--goto-backend.exp
+++ b/test/rlhc.d/case/zlen1_c.c-C-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_c.c-C-G2--goto-backend.in b/test/rlhc.d/case/zlen1_c.c-C-G2--goto-backend.in
index 4419e670..4419e670 100644
--- a/test/cases/rlhc.d/case/zlen1_c.c-C-G2--goto-backend.in
+++ b/test/rlhc.d/case/zlen1_c.c-C-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_c.c-C-T0--goto-backend.exp b/test/rlhc.d/case/zlen1_c.c-C-T0--goto-backend.exp
index 1a71f9fc..1a71f9fc 100644
--- a/test/cases/rlhc.d/case/zlen1_c.c-C-T0--goto-backend.exp
+++ b/test/rlhc.d/case/zlen1_c.c-C-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_c.c-C-T0--goto-backend.in b/test/rlhc.d/case/zlen1_c.c-C-T0--goto-backend.in
index b0fc41f9..b0fc41f9 100644
--- a/test/cases/rlhc.d/case/zlen1_c.c-C-T0--goto-backend.in
+++ b/test/rlhc.d/case/zlen1_c.c-C-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_c.c-C-T0--var-backend.exp b/test/rlhc.d/case/zlen1_c.c-C-T0--var-backend.exp
index 1804bf1a..1804bf1a 100644
--- a/test/cases/rlhc.d/case/zlen1_c.c-C-T0--var-backend.exp
+++ b/test/rlhc.d/case/zlen1_c.c-C-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_c.c-C-T0--var-backend.in b/test/rlhc.d/case/zlen1_c.c-C-T0--var-backend.in
index 253fe539..253fe539 100644
--- a/test/cases/rlhc.d/case/zlen1_c.c-C-T0--var-backend.in
+++ b/test/rlhc.d/case/zlen1_c.c-C-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_c.c-C-T1--goto-backend.exp b/test/rlhc.d/case/zlen1_c.c-C-T1--goto-backend.exp
index a280ae88..a280ae88 100644
--- a/test/cases/rlhc.d/case/zlen1_c.c-C-T1--goto-backend.exp
+++ b/test/rlhc.d/case/zlen1_c.c-C-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_c.c-C-T1--goto-backend.in b/test/rlhc.d/case/zlen1_c.c-C-T1--goto-backend.in
index cfe651c1..cfe651c1 100644
--- a/test/cases/rlhc.d/case/zlen1_c.c-C-T1--goto-backend.in
+++ b/test/rlhc.d/case/zlen1_c.c-C-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_c.c-C-T1--var-backend.exp b/test/rlhc.d/case/zlen1_c.c-C-T1--var-backend.exp
index 94b88588..94b88588 100644
--- a/test/cases/rlhc.d/case/zlen1_c.c-C-T1--var-backend.exp
+++ b/test/rlhc.d/case/zlen1_c.c-C-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_c.c-C-T1--var-backend.in b/test/rlhc.d/case/zlen1_c.c-C-T1--var-backend.in
index abfbd7a5..abfbd7a5 100644
--- a/test/cases/rlhc.d/case/zlen1_c.c-C-T1--var-backend.in
+++ b/test/rlhc.d/case/zlen1_c.c-C-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_crack.crk-K-F0--var-backend.exp b/test/rlhc.d/case/zlen1_crack.crk-K-F0--var-backend.exp
index 8fa388da..8fa388da 100644
--- a/test/cases/rlhc.d/case/zlen1_crack.crk-K-F0--var-backend.exp
+++ b/test/rlhc.d/case/zlen1_crack.crk-K-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_crack.crk-K-F0--var-backend.in b/test/rlhc.d/case/zlen1_crack.crk-K-F0--var-backend.in
index d9308464..d9308464 100644
--- a/test/cases/rlhc.d/case/zlen1_crack.crk-K-F0--var-backend.in
+++ b/test/rlhc.d/case/zlen1_crack.crk-K-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_crack.crk-K-F1--var-backend.exp b/test/rlhc.d/case/zlen1_crack.crk-K-F1--var-backend.exp
index 8fa388da..8fa388da 100644
--- a/test/cases/rlhc.d/case/zlen1_crack.crk-K-F1--var-backend.exp
+++ b/test/rlhc.d/case/zlen1_crack.crk-K-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_crack.crk-K-F1--var-backend.in b/test/rlhc.d/case/zlen1_crack.crk-K-F1--var-backend.in
index d9308464..d9308464 100644
--- a/test/cases/rlhc.d/case/zlen1_crack.crk-K-F1--var-backend.in
+++ b/test/rlhc.d/case/zlen1_crack.crk-K-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_crack.crk-K-T0--var-backend.exp b/test/rlhc.d/case/zlen1_crack.crk-K-T0--var-backend.exp
index ef1f67f3..ef1f67f3 100644
--- a/test/cases/rlhc.d/case/zlen1_crack.crk-K-T0--var-backend.exp
+++ b/test/rlhc.d/case/zlen1_crack.crk-K-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_crack.crk-K-T0--var-backend.in b/test/rlhc.d/case/zlen1_crack.crk-K-T0--var-backend.in
index 9693ccd1..9693ccd1 100644
--- a/test/cases/rlhc.d/case/zlen1_crack.crk-K-T0--var-backend.in
+++ b/test/rlhc.d/case/zlen1_crack.crk-K-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_crack.crk-K-T1--var-backend.exp b/test/rlhc.d/case/zlen1_crack.crk-K-T1--var-backend.exp
index 1a7ccbbd..1a7ccbbd 100644
--- a/test/cases/rlhc.d/case/zlen1_crack.crk-K-T1--var-backend.exp
+++ b/test/rlhc.d/case/zlen1_crack.crk-K-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_crack.crk-K-T1--var-backend.in b/test/rlhc.d/case/zlen1_crack.crk-K-T1--var-backend.in
index c42230d8..c42230d8 100644
--- a/test/cases/rlhc.d/case/zlen1_crack.crk-K-T1--var-backend.in
+++ b/test/rlhc.d/case/zlen1_crack.crk-K-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_cs.cs-A-F0--goto-backend.exp b/test/rlhc.d/case/zlen1_cs.cs-A-F0--goto-backend.exp
index aa4b165e..aa4b165e 100644
--- a/test/cases/rlhc.d/case/zlen1_cs.cs-A-F0--goto-backend.exp
+++ b/test/rlhc.d/case/zlen1_cs.cs-A-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_cs.cs-A-F0--goto-backend.in b/test/rlhc.d/case/zlen1_cs.cs-A-F0--goto-backend.in
index 3fd7714f..3fd7714f 100644
--- a/test/cases/rlhc.d/case/zlen1_cs.cs-A-F0--goto-backend.in
+++ b/test/rlhc.d/case/zlen1_cs.cs-A-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_cs.cs-A-F0--var-backend.exp b/test/rlhc.d/case/zlen1_cs.cs-A-F0--var-backend.exp
index b4480806..b4480806 100644
--- a/test/cases/rlhc.d/case/zlen1_cs.cs-A-F0--var-backend.exp
+++ b/test/rlhc.d/case/zlen1_cs.cs-A-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_cs.cs-A-F0--var-backend.in b/test/rlhc.d/case/zlen1_cs.cs-A-F0--var-backend.in
index ba313bf3..ba313bf3 100644
--- a/test/cases/rlhc.d/case/zlen1_cs.cs-A-F0--var-backend.in
+++ b/test/rlhc.d/case/zlen1_cs.cs-A-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_cs.cs-A-F1--goto-backend.exp b/test/rlhc.d/case/zlen1_cs.cs-A-F1--goto-backend.exp
index f6816dcf..f6816dcf 100644
--- a/test/cases/rlhc.d/case/zlen1_cs.cs-A-F1--goto-backend.exp
+++ b/test/rlhc.d/case/zlen1_cs.cs-A-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_cs.cs-A-F1--goto-backend.in b/test/rlhc.d/case/zlen1_cs.cs-A-F1--goto-backend.in
index 424c68d8..424c68d8 100644
--- a/test/cases/rlhc.d/case/zlen1_cs.cs-A-F1--goto-backend.in
+++ b/test/rlhc.d/case/zlen1_cs.cs-A-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_cs.cs-A-F1--var-backend.exp b/test/rlhc.d/case/zlen1_cs.cs-A-F1--var-backend.exp
index b4480806..b4480806 100644
--- a/test/cases/rlhc.d/case/zlen1_cs.cs-A-F1--var-backend.exp
+++ b/test/rlhc.d/case/zlen1_cs.cs-A-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_cs.cs-A-F1--var-backend.in b/test/rlhc.d/case/zlen1_cs.cs-A-F1--var-backend.in
index ba313bf3..ba313bf3 100644
--- a/test/cases/rlhc.d/case/zlen1_cs.cs-A-F1--var-backend.in
+++ b/test/rlhc.d/case/zlen1_cs.cs-A-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_cs.cs-A-G0--goto-backend.exp b/test/rlhc.d/case/zlen1_cs.cs-A-G0--goto-backend.exp
index 7891c804..7891c804 100644
--- a/test/cases/rlhc.d/case/zlen1_cs.cs-A-G0--goto-backend.exp
+++ b/test/rlhc.d/case/zlen1_cs.cs-A-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_cs.cs-A-G0--goto-backend.in b/test/rlhc.d/case/zlen1_cs.cs-A-G0--goto-backend.in
index 7f75c2a7..7f75c2a7 100644
--- a/test/cases/rlhc.d/case/zlen1_cs.cs-A-G0--goto-backend.in
+++ b/test/rlhc.d/case/zlen1_cs.cs-A-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_cs.cs-A-G1--goto-backend.exp b/test/rlhc.d/case/zlen1_cs.cs-A-G1--goto-backend.exp
index 17e0878d..17e0878d 100644
--- a/test/cases/rlhc.d/case/zlen1_cs.cs-A-G1--goto-backend.exp
+++ b/test/rlhc.d/case/zlen1_cs.cs-A-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_cs.cs-A-G1--goto-backend.in b/test/rlhc.d/case/zlen1_cs.cs-A-G1--goto-backend.in
index 82c6a83b..82c6a83b 100644
--- a/test/cases/rlhc.d/case/zlen1_cs.cs-A-G1--goto-backend.in
+++ b/test/rlhc.d/case/zlen1_cs.cs-A-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_cs.cs-A-T0--goto-backend.exp b/test/rlhc.d/case/zlen1_cs.cs-A-T0--goto-backend.exp
index d0f7a289..d0f7a289 100644
--- a/test/cases/rlhc.d/case/zlen1_cs.cs-A-T0--goto-backend.exp
+++ b/test/rlhc.d/case/zlen1_cs.cs-A-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_cs.cs-A-T0--goto-backend.in b/test/rlhc.d/case/zlen1_cs.cs-A-T0--goto-backend.in
index be42bf9e..be42bf9e 100644
--- a/test/cases/rlhc.d/case/zlen1_cs.cs-A-T0--goto-backend.in
+++ b/test/rlhc.d/case/zlen1_cs.cs-A-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_cs.cs-A-T0--var-backend.exp b/test/rlhc.d/case/zlen1_cs.cs-A-T0--var-backend.exp
index 1f734f53..1f734f53 100644
--- a/test/cases/rlhc.d/case/zlen1_cs.cs-A-T0--var-backend.exp
+++ b/test/rlhc.d/case/zlen1_cs.cs-A-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_cs.cs-A-T0--var-backend.in b/test/rlhc.d/case/zlen1_cs.cs-A-T0--var-backend.in
index c54cb92b..c54cb92b 100644
--- a/test/cases/rlhc.d/case/zlen1_cs.cs-A-T0--var-backend.in
+++ b/test/rlhc.d/case/zlen1_cs.cs-A-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_cs.cs-A-T1--goto-backend.exp b/test/rlhc.d/case/zlen1_cs.cs-A-T1--goto-backend.exp
index f7b9d95a..f7b9d95a 100644
--- a/test/cases/rlhc.d/case/zlen1_cs.cs-A-T1--goto-backend.exp
+++ b/test/rlhc.d/case/zlen1_cs.cs-A-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_cs.cs-A-T1--goto-backend.in b/test/rlhc.d/case/zlen1_cs.cs-A-T1--goto-backend.in
index 23373ac2..23373ac2 100644
--- a/test/cases/rlhc.d/case/zlen1_cs.cs-A-T1--goto-backend.in
+++ b/test/rlhc.d/case/zlen1_cs.cs-A-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_cs.cs-A-T1--var-backend.exp b/test/rlhc.d/case/zlen1_cs.cs-A-T1--var-backend.exp
index db9cc237..db9cc237 100644
--- a/test/cases/rlhc.d/case/zlen1_cs.cs-A-T1--var-backend.exp
+++ b/test/rlhc.d/case/zlen1_cs.cs-A-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_cs.cs-A-T1--var-backend.in b/test/rlhc.d/case/zlen1_cs.cs-A-T1--var-backend.in
index 173c6358..173c6358 100644
--- a/test/cases/rlhc.d/case/zlen1_cs.cs-A-T1--var-backend.in
+++ b/test/rlhc.d/case/zlen1_cs.cs-A-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_go.go-Z-F0--goto-backend.exp b/test/rlhc.d/case/zlen1_go.go-Z-F0--goto-backend.exp
index bcd9d1a7..bcd9d1a7 100644
--- a/test/cases/rlhc.d/case/zlen1_go.go-Z-F0--goto-backend.exp
+++ b/test/rlhc.d/case/zlen1_go.go-Z-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_go.go-Z-F0--goto-backend.in b/test/rlhc.d/case/zlen1_go.go-Z-F0--goto-backend.in
index 793394ab..793394ab 100644
--- a/test/cases/rlhc.d/case/zlen1_go.go-Z-F0--goto-backend.in
+++ b/test/rlhc.d/case/zlen1_go.go-Z-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_go.go-Z-F0--var-backend.exp b/test/rlhc.d/case/zlen1_go.go-Z-F0--var-backend.exp
index b5a8084f..b5a8084f 100644
--- a/test/cases/rlhc.d/case/zlen1_go.go-Z-F0--var-backend.exp
+++ b/test/rlhc.d/case/zlen1_go.go-Z-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_go.go-Z-F0--var-backend.in b/test/rlhc.d/case/zlen1_go.go-Z-F0--var-backend.in
index b59137d0..b59137d0 100644
--- a/test/cases/rlhc.d/case/zlen1_go.go-Z-F0--var-backend.in
+++ b/test/rlhc.d/case/zlen1_go.go-Z-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_go.go-Z-F1--goto-backend.exp b/test/rlhc.d/case/zlen1_go.go-Z-F1--goto-backend.exp
index f91bbf8d..f91bbf8d 100644
--- a/test/cases/rlhc.d/case/zlen1_go.go-Z-F1--goto-backend.exp
+++ b/test/rlhc.d/case/zlen1_go.go-Z-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_go.go-Z-F1--goto-backend.in b/test/rlhc.d/case/zlen1_go.go-Z-F1--goto-backend.in
index 78c8ac0b..78c8ac0b 100644
--- a/test/cases/rlhc.d/case/zlen1_go.go-Z-F1--goto-backend.in
+++ b/test/rlhc.d/case/zlen1_go.go-Z-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_go.go-Z-F1--var-backend.exp b/test/rlhc.d/case/zlen1_go.go-Z-F1--var-backend.exp
index b5a8084f..b5a8084f 100644
--- a/test/cases/rlhc.d/case/zlen1_go.go-Z-F1--var-backend.exp
+++ b/test/rlhc.d/case/zlen1_go.go-Z-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_go.go-Z-F1--var-backend.in b/test/rlhc.d/case/zlen1_go.go-Z-F1--var-backend.in
index b59137d0..b59137d0 100644
--- a/test/cases/rlhc.d/case/zlen1_go.go-Z-F1--var-backend.in
+++ b/test/rlhc.d/case/zlen1_go.go-Z-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_go.go-Z-G0--goto-backend.exp b/test/rlhc.d/case/zlen1_go.go-Z-G0--goto-backend.exp
index b29002a1..b29002a1 100644
--- a/test/cases/rlhc.d/case/zlen1_go.go-Z-G0--goto-backend.exp
+++ b/test/rlhc.d/case/zlen1_go.go-Z-G0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_go.go-Z-G0--goto-backend.in b/test/rlhc.d/case/zlen1_go.go-Z-G0--goto-backend.in
index aed6f5f0..aed6f5f0 100644
--- a/test/cases/rlhc.d/case/zlen1_go.go-Z-G0--goto-backend.in
+++ b/test/rlhc.d/case/zlen1_go.go-Z-G0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_go.go-Z-G1--goto-backend.exp b/test/rlhc.d/case/zlen1_go.go-Z-G1--goto-backend.exp
index fe704729..fe704729 100644
--- a/test/cases/rlhc.d/case/zlen1_go.go-Z-G1--goto-backend.exp
+++ b/test/rlhc.d/case/zlen1_go.go-Z-G1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_go.go-Z-G1--goto-backend.in b/test/rlhc.d/case/zlen1_go.go-Z-G1--goto-backend.in
index 77f8d1e4..77f8d1e4 100644
--- a/test/cases/rlhc.d/case/zlen1_go.go-Z-G1--goto-backend.in
+++ b/test/rlhc.d/case/zlen1_go.go-Z-G1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_go.go-Z-G2--goto-backend.exp b/test/rlhc.d/case/zlen1_go.go-Z-G2--goto-backend.exp
index 6b4401a8..6b4401a8 100644
--- a/test/cases/rlhc.d/case/zlen1_go.go-Z-G2--goto-backend.exp
+++ b/test/rlhc.d/case/zlen1_go.go-Z-G2--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_go.go-Z-G2--goto-backend.in b/test/rlhc.d/case/zlen1_go.go-Z-G2--goto-backend.in
index ebd5828d..ebd5828d 100644
--- a/test/cases/rlhc.d/case/zlen1_go.go-Z-G2--goto-backend.in
+++ b/test/rlhc.d/case/zlen1_go.go-Z-G2--goto-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_go.go-Z-T0--goto-backend.exp b/test/rlhc.d/case/zlen1_go.go-Z-T0--goto-backend.exp
index 793c3f7d..793c3f7d 100644
--- a/test/cases/rlhc.d/case/zlen1_go.go-Z-T0--goto-backend.exp
+++ b/test/rlhc.d/case/zlen1_go.go-Z-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_go.go-Z-T0--goto-backend.in b/test/rlhc.d/case/zlen1_go.go-Z-T0--goto-backend.in
index 3690279a..3690279a 100644
--- a/test/cases/rlhc.d/case/zlen1_go.go-Z-T0--goto-backend.in
+++ b/test/rlhc.d/case/zlen1_go.go-Z-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_go.go-Z-T0--var-backend.exp b/test/rlhc.d/case/zlen1_go.go-Z-T0--var-backend.exp
index dff7b8f8..dff7b8f8 100644
--- a/test/cases/rlhc.d/case/zlen1_go.go-Z-T0--var-backend.exp
+++ b/test/rlhc.d/case/zlen1_go.go-Z-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_go.go-Z-T0--var-backend.in b/test/rlhc.d/case/zlen1_go.go-Z-T0--var-backend.in
index 9ca9e754..9ca9e754 100644
--- a/test/cases/rlhc.d/case/zlen1_go.go-Z-T0--var-backend.in
+++ b/test/rlhc.d/case/zlen1_go.go-Z-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_go.go-Z-T1--goto-backend.exp b/test/rlhc.d/case/zlen1_go.go-Z-T1--goto-backend.exp
index de3bcb36..de3bcb36 100644
--- a/test/cases/rlhc.d/case/zlen1_go.go-Z-T1--goto-backend.exp
+++ b/test/rlhc.d/case/zlen1_go.go-Z-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_go.go-Z-T1--goto-backend.in b/test/rlhc.d/case/zlen1_go.go-Z-T1--goto-backend.in
index dbb7a026..dbb7a026 100644
--- a/test/cases/rlhc.d/case/zlen1_go.go-Z-T1--goto-backend.in
+++ b/test/rlhc.d/case/zlen1_go.go-Z-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_go.go-Z-T1--var-backend.exp b/test/rlhc.d/case/zlen1_go.go-Z-T1--var-backend.exp
index 105e5626..105e5626 100644
--- a/test/cases/rlhc.d/case/zlen1_go.go-Z-T1--var-backend.exp
+++ b/test/rlhc.d/case/zlen1_go.go-Z-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_go.go-Z-T1--var-backend.in b/test/rlhc.d/case/zlen1_go.go-Z-T1--var-backend.in
index 18826aee..18826aee 100644
--- a/test/cases/rlhc.d/case/zlen1_go.go-Z-T1--var-backend.in
+++ b/test/rlhc.d/case/zlen1_go.go-Z-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_java.java-J-F0--goto-backend.exp b/test/rlhc.d/case/zlen1_java.java-J-F0--goto-backend.exp
index 2aada67d..2aada67d 100644
--- a/test/cases/rlhc.d/case/zlen1_java.java-J-F0--goto-backend.exp
+++ b/test/rlhc.d/case/zlen1_java.java-J-F0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_java.java-J-F0--goto-backend.in b/test/rlhc.d/case/zlen1_java.java-J-F0--goto-backend.in
index 3fa00731..3fa00731 100644
--- a/test/cases/rlhc.d/case/zlen1_java.java-J-F0--goto-backend.in
+++ b/test/rlhc.d/case/zlen1_java.java-J-F0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_java.java-J-F0--var-backend.exp b/test/rlhc.d/case/zlen1_java.java-J-F0--var-backend.exp
index cf890c5a..cf890c5a 100644
--- a/test/cases/rlhc.d/case/zlen1_java.java-J-F0--var-backend.exp
+++ b/test/rlhc.d/case/zlen1_java.java-J-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_java.java-J-F0--var-backend.in b/test/rlhc.d/case/zlen1_java.java-J-F0--var-backend.in
index f37ea93c..f37ea93c 100644
--- a/test/cases/rlhc.d/case/zlen1_java.java-J-F0--var-backend.in
+++ b/test/rlhc.d/case/zlen1_java.java-J-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_java.java-J-F1--goto-backend.exp b/test/rlhc.d/case/zlen1_java.java-J-F1--goto-backend.exp
index e7849068..e7849068 100644
--- a/test/cases/rlhc.d/case/zlen1_java.java-J-F1--goto-backend.exp
+++ b/test/rlhc.d/case/zlen1_java.java-J-F1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_java.java-J-F1--goto-backend.in b/test/rlhc.d/case/zlen1_java.java-J-F1--goto-backend.in
index e7370bd7..e7370bd7 100644
--- a/test/cases/rlhc.d/case/zlen1_java.java-J-F1--goto-backend.in
+++ b/test/rlhc.d/case/zlen1_java.java-J-F1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_java.java-J-F1--var-backend.exp b/test/rlhc.d/case/zlen1_java.java-J-F1--var-backend.exp
index cf890c5a..cf890c5a 100644
--- a/test/cases/rlhc.d/case/zlen1_java.java-J-F1--var-backend.exp
+++ b/test/rlhc.d/case/zlen1_java.java-J-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_java.java-J-F1--var-backend.in b/test/rlhc.d/case/zlen1_java.java-J-F1--var-backend.in
index f37ea93c..f37ea93c 100644
--- a/test/cases/rlhc.d/case/zlen1_java.java-J-F1--var-backend.in
+++ b/test/rlhc.d/case/zlen1_java.java-J-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_java.java-J-T0--goto-backend.exp b/test/rlhc.d/case/zlen1_java.java-J-T0--goto-backend.exp
index 3b03729e..3b03729e 100644
--- a/test/cases/rlhc.d/case/zlen1_java.java-J-T0--goto-backend.exp
+++ b/test/rlhc.d/case/zlen1_java.java-J-T0--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_java.java-J-T0--goto-backend.in b/test/rlhc.d/case/zlen1_java.java-J-T0--goto-backend.in
index 0af02ce3..0af02ce3 100644
--- a/test/cases/rlhc.d/case/zlen1_java.java-J-T0--goto-backend.in
+++ b/test/rlhc.d/case/zlen1_java.java-J-T0--goto-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_java.java-J-T0--var-backend.exp b/test/rlhc.d/case/zlen1_java.java-J-T0--var-backend.exp
index 8c82af6c..8c82af6c 100644
--- a/test/cases/rlhc.d/case/zlen1_java.java-J-T0--var-backend.exp
+++ b/test/rlhc.d/case/zlen1_java.java-J-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_java.java-J-T0--var-backend.in b/test/rlhc.d/case/zlen1_java.java-J-T0--var-backend.in
index 1929a749..1929a749 100644
--- a/test/cases/rlhc.d/case/zlen1_java.java-J-T0--var-backend.in
+++ b/test/rlhc.d/case/zlen1_java.java-J-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_java.java-J-T1--goto-backend.exp b/test/rlhc.d/case/zlen1_java.java-J-T1--goto-backend.exp
index 12fcdfe3..12fcdfe3 100644
--- a/test/cases/rlhc.d/case/zlen1_java.java-J-T1--goto-backend.exp
+++ b/test/rlhc.d/case/zlen1_java.java-J-T1--goto-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_java.java-J-T1--goto-backend.in b/test/rlhc.d/case/zlen1_java.java-J-T1--goto-backend.in
index faa9bb4b..faa9bb4b 100644
--- a/test/cases/rlhc.d/case/zlen1_java.java-J-T1--goto-backend.in
+++ b/test/rlhc.d/case/zlen1_java.java-J-T1--goto-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_java.java-J-T1--var-backend.exp b/test/rlhc.d/case/zlen1_java.java-J-T1--var-backend.exp
index c37b563e..c37b563e 100644
--- a/test/cases/rlhc.d/case/zlen1_java.java-J-T1--var-backend.exp
+++ b/test/rlhc.d/case/zlen1_java.java-J-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_java.java-J-T1--var-backend.in b/test/rlhc.d/case/zlen1_java.java-J-T1--var-backend.in
index b902c41c..b902c41c 100644
--- a/test/cases/rlhc.d/case/zlen1_java.java-J-T1--var-backend.in
+++ b/test/rlhc.d/case/zlen1_java.java-J-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_julia.jl-Y-F0--var-backend.exp b/test/rlhc.d/case/zlen1_julia.jl-Y-F0--var-backend.exp
index bf8fea11..bf8fea11 100644
--- a/test/cases/rlhc.d/case/zlen1_julia.jl-Y-F0--var-backend.exp
+++ b/test/rlhc.d/case/zlen1_julia.jl-Y-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_julia.jl-Y-F0--var-backend.in b/test/rlhc.d/case/zlen1_julia.jl-Y-F0--var-backend.in
index b409895e..b409895e 100644
--- a/test/cases/rlhc.d/case/zlen1_julia.jl-Y-F0--var-backend.in
+++ b/test/rlhc.d/case/zlen1_julia.jl-Y-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_julia.jl-Y-F1--var-backend.exp b/test/rlhc.d/case/zlen1_julia.jl-Y-F1--var-backend.exp
index bf8fea11..bf8fea11 100644
--- a/test/cases/rlhc.d/case/zlen1_julia.jl-Y-F1--var-backend.exp
+++ b/test/rlhc.d/case/zlen1_julia.jl-Y-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_julia.jl-Y-F1--var-backend.in b/test/rlhc.d/case/zlen1_julia.jl-Y-F1--var-backend.in
index b409895e..b409895e 100644
--- a/test/cases/rlhc.d/case/zlen1_julia.jl-Y-F1--var-backend.in
+++ b/test/rlhc.d/case/zlen1_julia.jl-Y-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_julia.jl-Y-T0--var-backend.exp b/test/rlhc.d/case/zlen1_julia.jl-Y-T0--var-backend.exp
index 0ed3a7e1..0ed3a7e1 100644
--- a/test/cases/rlhc.d/case/zlen1_julia.jl-Y-T0--var-backend.exp
+++ b/test/rlhc.d/case/zlen1_julia.jl-Y-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_julia.jl-Y-T0--var-backend.in b/test/rlhc.d/case/zlen1_julia.jl-Y-T0--var-backend.in
index e3b0c992..e3b0c992 100644
--- a/test/cases/rlhc.d/case/zlen1_julia.jl-Y-T0--var-backend.in
+++ b/test/rlhc.d/case/zlen1_julia.jl-Y-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_julia.jl-Y-T1--var-backend.exp b/test/rlhc.d/case/zlen1_julia.jl-Y-T1--var-backend.exp
index 287d5d26..287d5d26 100644
--- a/test/cases/rlhc.d/case/zlen1_julia.jl-Y-T1--var-backend.exp
+++ b/test/rlhc.d/case/zlen1_julia.jl-Y-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_julia.jl-Y-T1--var-backend.in b/test/rlhc.d/case/zlen1_julia.jl-Y-T1--var-backend.in
index 283a4a53..283a4a53 100644
--- a/test/cases/rlhc.d/case/zlen1_julia.jl-Y-T1--var-backend.in
+++ b/test/rlhc.d/case/zlen1_julia.jl-Y-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_ocaml.ml-O-F0--var-backend.exp b/test/rlhc.d/case/zlen1_ocaml.ml-O-F0--var-backend.exp
index caec87a3..caec87a3 100644
--- a/test/cases/rlhc.d/case/zlen1_ocaml.ml-O-F0--var-backend.exp
+++ b/test/rlhc.d/case/zlen1_ocaml.ml-O-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_ocaml.ml-O-F0--var-backend.in b/test/rlhc.d/case/zlen1_ocaml.ml-O-F0--var-backend.in
index c79c05e0..c79c05e0 100644
--- a/test/cases/rlhc.d/case/zlen1_ocaml.ml-O-F0--var-backend.in
+++ b/test/rlhc.d/case/zlen1_ocaml.ml-O-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_ocaml.ml-O-F1--var-backend.exp b/test/rlhc.d/case/zlen1_ocaml.ml-O-F1--var-backend.exp
index caec87a3..caec87a3 100644
--- a/test/cases/rlhc.d/case/zlen1_ocaml.ml-O-F1--var-backend.exp
+++ b/test/rlhc.d/case/zlen1_ocaml.ml-O-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_ocaml.ml-O-F1--var-backend.in b/test/rlhc.d/case/zlen1_ocaml.ml-O-F1--var-backend.in
index c79c05e0..c79c05e0 100644
--- a/test/cases/rlhc.d/case/zlen1_ocaml.ml-O-F1--var-backend.in
+++ b/test/rlhc.d/case/zlen1_ocaml.ml-O-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_ocaml.ml-O-T0--var-backend.exp b/test/rlhc.d/case/zlen1_ocaml.ml-O-T0--var-backend.exp
index 2ca37679..2ca37679 100644
--- a/test/cases/rlhc.d/case/zlen1_ocaml.ml-O-T0--var-backend.exp
+++ b/test/rlhc.d/case/zlen1_ocaml.ml-O-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_ocaml.ml-O-T0--var-backend.in b/test/rlhc.d/case/zlen1_ocaml.ml-O-T0--var-backend.in
index 81b0b5dd..81b0b5dd 100644
--- a/test/cases/rlhc.d/case/zlen1_ocaml.ml-O-T0--var-backend.in
+++ b/test/rlhc.d/case/zlen1_ocaml.ml-O-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_ocaml.ml-O-T1--var-backend.exp b/test/rlhc.d/case/zlen1_ocaml.ml-O-T1--var-backend.exp
index 4f6a32da..4f6a32da 100644
--- a/test/cases/rlhc.d/case/zlen1_ocaml.ml-O-T1--var-backend.exp
+++ b/test/rlhc.d/case/zlen1_ocaml.ml-O-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_ocaml.ml-O-T1--var-backend.in b/test/rlhc.d/case/zlen1_ocaml.ml-O-T1--var-backend.in
index 9191ba39..9191ba39 100644
--- a/test/cases/rlhc.d/case/zlen1_ocaml.ml-O-T1--var-backend.in
+++ b/test/rlhc.d/case/zlen1_ocaml.ml-O-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_ruby.rb-R-F0--var-backend.exp b/test/rlhc.d/case/zlen1_ruby.rb-R-F0--var-backend.exp
index dc1ca87a..dc1ca87a 100644
--- a/test/cases/rlhc.d/case/zlen1_ruby.rb-R-F0--var-backend.exp
+++ b/test/rlhc.d/case/zlen1_ruby.rb-R-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_ruby.rb-R-F0--var-backend.in b/test/rlhc.d/case/zlen1_ruby.rb-R-F0--var-backend.in
index 7bd5f9fb..7bd5f9fb 100644
--- a/test/cases/rlhc.d/case/zlen1_ruby.rb-R-F0--var-backend.in
+++ b/test/rlhc.d/case/zlen1_ruby.rb-R-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_ruby.rb-R-F1--var-backend.exp b/test/rlhc.d/case/zlen1_ruby.rb-R-F1--var-backend.exp
index dc1ca87a..dc1ca87a 100644
--- a/test/cases/rlhc.d/case/zlen1_ruby.rb-R-F1--var-backend.exp
+++ b/test/rlhc.d/case/zlen1_ruby.rb-R-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_ruby.rb-R-F1--var-backend.in b/test/rlhc.d/case/zlen1_ruby.rb-R-F1--var-backend.in
index 7bd5f9fb..7bd5f9fb 100644
--- a/test/cases/rlhc.d/case/zlen1_ruby.rb-R-F1--var-backend.in
+++ b/test/rlhc.d/case/zlen1_ruby.rb-R-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_ruby.rb-R-T0--var-backend.exp b/test/rlhc.d/case/zlen1_ruby.rb-R-T0--var-backend.exp
index 4410d63e..4410d63e 100644
--- a/test/cases/rlhc.d/case/zlen1_ruby.rb-R-T0--var-backend.exp
+++ b/test/rlhc.d/case/zlen1_ruby.rb-R-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_ruby.rb-R-T0--var-backend.in b/test/rlhc.d/case/zlen1_ruby.rb-R-T0--var-backend.in
index 9ec3604e..9ec3604e 100644
--- a/test/cases/rlhc.d/case/zlen1_ruby.rb-R-T0--var-backend.in
+++ b/test/rlhc.d/case/zlen1_ruby.rb-R-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_ruby.rb-R-T1--var-backend.exp b/test/rlhc.d/case/zlen1_ruby.rb-R-T1--var-backend.exp
index 96b7dc5d..96b7dc5d 100644
--- a/test/cases/rlhc.d/case/zlen1_ruby.rb-R-T1--var-backend.exp
+++ b/test/rlhc.d/case/zlen1_ruby.rb-R-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_ruby.rb-R-T1--var-backend.in b/test/rlhc.d/case/zlen1_ruby.rb-R-T1--var-backend.in
index cc269e30..cc269e30 100644
--- a/test/cases/rlhc.d/case/zlen1_ruby.rb-R-T1--var-backend.in
+++ b/test/rlhc.d/case/zlen1_ruby.rb-R-T1--var-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_rust.rs-U-F0--var-backend.exp b/test/rlhc.d/case/zlen1_rust.rs-U-F0--var-backend.exp
index 5a36288f..5a36288f 100644
--- a/test/cases/rlhc.d/case/zlen1_rust.rs-U-F0--var-backend.exp
+++ b/test/rlhc.d/case/zlen1_rust.rs-U-F0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_rust.rs-U-F0--var-backend.in b/test/rlhc.d/case/zlen1_rust.rs-U-F0--var-backend.in
index 5a231b68..5a231b68 100644
--- a/test/cases/rlhc.d/case/zlen1_rust.rs-U-F0--var-backend.in
+++ b/test/rlhc.d/case/zlen1_rust.rs-U-F0--var-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_rust.rs-U-F1--var-backend.exp b/test/rlhc.d/case/zlen1_rust.rs-U-F1--var-backend.exp
index 5a36288f..5a36288f 100644
--- a/test/cases/rlhc.d/case/zlen1_rust.rs-U-F1--var-backend.exp
+++ b/test/rlhc.d/case/zlen1_rust.rs-U-F1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_rust.rs-U-F1--var-backend.in b/test/rlhc.d/case/zlen1_rust.rs-U-F1--var-backend.in
index 5a231b68..5a231b68 100644
--- a/test/cases/rlhc.d/case/zlen1_rust.rs-U-F1--var-backend.in
+++ b/test/rlhc.d/case/zlen1_rust.rs-U-F1--var-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_rust.rs-U-T0--var-backend.exp b/test/rlhc.d/case/zlen1_rust.rs-U-T0--var-backend.exp
index f7c5cadc..f7c5cadc 100644
--- a/test/cases/rlhc.d/case/zlen1_rust.rs-U-T0--var-backend.exp
+++ b/test/rlhc.d/case/zlen1_rust.rs-U-T0--var-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_rust.rs-U-T0--var-backend.in b/test/rlhc.d/case/zlen1_rust.rs-U-T0--var-backend.in
index 2fee1659..2fee1659 100644
--- a/test/cases/rlhc.d/case/zlen1_rust.rs-U-T0--var-backend.in
+++ b/test/rlhc.d/case/zlen1_rust.rs-U-T0--var-backend.in
diff --git a/test/cases/rlhc.d/case/zlen1_rust.rs-U-T1--var-backend.exp b/test/rlhc.d/case/zlen1_rust.rs-U-T1--var-backend.exp
index 63f1340b..63f1340b 100644
--- a/test/cases/rlhc.d/case/zlen1_rust.rs-U-T1--var-backend.exp
+++ b/test/rlhc.d/case/zlen1_rust.rs-U-T1--var-backend.exp
diff --git a/test/cases/rlhc.d/case/zlen1_rust.rs-U-T1--var-backend.in b/test/rlhc.d/case/zlen1_rust.rs-U-T1--var-backend.in
index cf5ee124..cf5ee124 100644
--- a/test/cases/rlhc.d/case/zlen1_rust.rs-U-T1--var-backend.in
+++ b/test/rlhc.d/case/zlen1_rust.rs-U-T1--var-backend.in
diff --git a/test/cases/rlhc.d/gentests b/test/rlhc.d/gentests
index 828d54fa..828d54fa 100755
--- a/test/cases/rlhc.d/gentests
+++ b/test/rlhc.d/gentests
diff --git a/test/cases/rlhc.d/rlhc-c.lm b/test/rlhc.d/rlhc-c.lm
index d6cf3136..d6cf3136 100644
--- a/test/cases/rlhc.d/rlhc-c.lm
+++ b/test/rlhc.d/rlhc-c.lm
diff --git a/test/cases/rlhc.d/rlhc-crack.lm b/test/rlhc.d/rlhc-crack.lm
index b7902a46..b7902a46 100644
--- a/test/cases/rlhc.d/rlhc-crack.lm
+++ b/test/rlhc.d/rlhc-crack.lm
diff --git a/test/cases/rlhc.d/rlhc-csharp.lm b/test/rlhc.d/rlhc-csharp.lm
index 1ae36af2..1ae36af2 100644
--- a/test/cases/rlhc.d/rlhc-csharp.lm
+++ b/test/rlhc.d/rlhc-csharp.lm
diff --git a/test/cases/rlhc.d/rlhc-d.lm b/test/rlhc.d/rlhc-d.lm
index 20e2e057..20e2e057 100644
--- a/test/cases/rlhc.d/rlhc-d.lm
+++ b/test/rlhc.d/rlhc-d.lm
diff --git a/test/cases/rlhc.d/rlhc-go.lm b/test/rlhc.d/rlhc-go.lm
index 4d782998..4d782998 100644
--- a/test/cases/rlhc.d/rlhc-go.lm
+++ b/test/rlhc.d/rlhc-go.lm
diff --git a/test/cases/rlhc.d/rlhc-host.lm b/test/rlhc.d/rlhc-host.lm
index 10297bed..10297bed 100644
--- a/test/cases/rlhc.d/rlhc-host.lm
+++ b/test/rlhc.d/rlhc-host.lm
diff --git a/test/cases/rlhc.d/rlhc-java.lm b/test/rlhc.d/rlhc-java.lm
index c1f97c7f..c1f97c7f 100644
--- a/test/cases/rlhc.d/rlhc-java.lm
+++ b/test/rlhc.d/rlhc-java.lm
diff --git a/test/cases/rlhc.d/rlhc-js.lm b/test/rlhc.d/rlhc-js.lm
index f0d9c32b..f0d9c32b 100644
--- a/test/cases/rlhc.d/rlhc-js.lm
+++ b/test/rlhc.d/rlhc-js.lm
diff --git a/test/cases/rlhc.d/rlhc-julia.lm b/test/rlhc.d/rlhc-julia.lm
index c13fb460..c13fb460 100644
--- a/test/cases/rlhc.d/rlhc-julia.lm
+++ b/test/rlhc.d/rlhc-julia.lm
diff --git a/test/cases/rlhc.d/rlhc-ocaml.lm b/test/rlhc.d/rlhc-ocaml.lm
index 1ab33ba7..1ab33ba7 100644
--- a/test/cases/rlhc.d/rlhc-ocaml.lm
+++ b/test/rlhc.d/rlhc-ocaml.lm
diff --git a/test/cases/rlhc.d/rlhc-ruby.lm b/test/rlhc.d/rlhc-ruby.lm
index fda37638..fda37638 100644
--- a/test/cases/rlhc.d/rlhc-ruby.lm
+++ b/test/rlhc.d/rlhc-ruby.lm
diff --git a/test/cases/rlhc.d/rlhc-rust.lm b/test/rlhc.d/rlhc-rust.lm
index e7b28fd6..e7b28fd6 100644
--- a/test/cases/rlhc.d/rlhc-rust.lm
+++ b/test/rlhc.d/rlhc-rust.lm
diff --git a/test/cases/rlhc.d/rlhc.lm b/test/rlhc.d/rlhc.lm
index 48fdecdf..48fdecdf 100644
--- a/test/cases/rlhc.d/rlhc.lm
+++ b/test/rlhc.d/rlhc.lm
diff --git a/test/cases/rlparse.d/.gitignore b/test/rlparse.d/.gitignore
index 5aa3d1bf..5aa3d1bf 100644
--- a/test/cases/rlparse.d/.gitignore
+++ b/test/rlparse.d/.gitignore
diff --git a/test/cases/rlparse.d/Makefile b/test/rlparse.d/Makefile
index f030bb1a..f030bb1a 100644
--- a/test/cases/rlparse.d/Makefile
+++ b/test/rlparse.d/Makefile
diff --git a/test/cases/rlparse.d/action.h b/test/rlparse.d/action.h
index 40af6160..40af6160 100644
--- a/test/cases/rlparse.d/action.h
+++ b/test/rlparse.d/action.h
diff --git a/test/cases/rlparse.d/actparams.cc b/test/rlparse.d/actparams.cc
index d9e9d6ff..d9e9d6ff 100644
--- a/test/cases/rlparse.d/actparams.cc
+++ b/test/rlparse.d/actparams.cc
diff --git a/test/cases/rlparse.d/avlbasic.h b/test/rlparse.d/avlbasic.h
index ed826f38..ed826f38 100644
--- a/test/cases/rlparse.d/avlbasic.h
+++ b/test/rlparse.d/avlbasic.h
diff --git a/test/cases/rlparse.d/avlcommon.h b/test/rlparse.d/avlcommon.h
index 08fb3af0..08fb3af0 100644
--- a/test/cases/rlparse.d/avlcommon.h
+++ b/test/rlparse.d/avlcommon.h
diff --git a/test/cases/rlparse.d/avlibasic.h b/test/rlparse.d/avlibasic.h
index b916f742..b916f742 100644
--- a/test/cases/rlparse.d/avlibasic.h
+++ b/test/rlparse.d/avlibasic.h
diff --git a/test/cases/rlparse.d/avlikeyless.h b/test/rlparse.d/avlikeyless.h
index 0c606089..0c606089 100644
--- a/test/cases/rlparse.d/avlikeyless.h
+++ b/test/rlparse.d/avlikeyless.h
diff --git a/test/cases/rlparse.d/avlimap.h b/test/rlparse.d/avlimap.h
index c207dc52..c207dc52 100644
--- a/test/cases/rlparse.d/avlimap.h
+++ b/test/rlparse.d/avlimap.h
diff --git a/test/cases/rlparse.d/avlimel.h b/test/rlparse.d/avlimel.h
index bceddcd4..bceddcd4 100644
--- a/test/cases/rlparse.d/avlimel.h
+++ b/test/rlparse.d/avlimel.h
diff --git a/test/cases/rlparse.d/avlimelkey.h b/test/rlparse.d/avlimelkey.h
index 52d3a409..52d3a409 100644
--- a/test/cases/rlparse.d/avlimelkey.h
+++ b/test/rlparse.d/avlimelkey.h
diff --git a/test/cases/rlparse.d/avliset.h b/test/rlparse.d/avliset.h
index 9594e7d7..9594e7d7 100644
--- a/test/cases/rlparse.d/avliset.h
+++ b/test/rlparse.d/avliset.h
diff --git a/test/cases/rlparse.d/avlitree.h b/test/rlparse.d/avlitree.h
index 28394bb1..28394bb1 100644
--- a/test/cases/rlparse.d/avlitree.h
+++ b/test/rlparse.d/avlitree.h
diff --git a/test/cases/rlparse.d/avlkeyless.h b/test/rlparse.d/avlkeyless.h
index fecf8bda..fecf8bda 100644
--- a/test/cases/rlparse.d/avlkeyless.h
+++ b/test/rlparse.d/avlkeyless.h
diff --git a/test/cases/rlparse.d/avlmap.h b/test/rlparse.d/avlmap.h
index 378613cd..378613cd 100644
--- a/test/cases/rlparse.d/avlmap.h
+++ b/test/rlparse.d/avlmap.h
diff --git a/test/cases/rlparse.d/avlmel.h b/test/rlparse.d/avlmel.h
index 6d0deb7d..6d0deb7d 100644
--- a/test/cases/rlparse.d/avlmel.h
+++ b/test/rlparse.d/avlmel.h
diff --git a/test/cases/rlparse.d/avlmelkey.h b/test/rlparse.d/avlmelkey.h
index 5a66c9c2..5a66c9c2 100644
--- a/test/cases/rlparse.d/avlmelkey.h
+++ b/test/rlparse.d/avlmelkey.h
diff --git a/test/cases/rlparse.d/avlset.h b/test/rlparse.d/avlset.h
index 579378a3..579378a3 100644
--- a/test/cases/rlparse.d/avlset.h
+++ b/test/rlparse.d/avlset.h
diff --git a/test/cases/rlparse.d/avltree.h b/test/rlparse.d/avltree.h
index 2aa8e15f..2aa8e15f 100644
--- a/test/cases/rlparse.d/avltree.h
+++ b/test/rlparse.d/avltree.h
diff --git a/test/cases/rlparse.d/bstcommon.h b/test/rlparse.d/bstcommon.h
index 7c53ff31..7c53ff31 100644
--- a/test/cases/rlparse.d/bstcommon.h
+++ b/test/rlparse.d/bstcommon.h
diff --git a/test/cases/rlparse.d/bstmap.h b/test/rlparse.d/bstmap.h
index 30c8e3c5..30c8e3c5 100644
--- a/test/cases/rlparse.d/bstmap.h
+++ b/test/rlparse.d/bstmap.h
diff --git a/test/cases/rlparse.d/bstset.h b/test/rlparse.d/bstset.h
index 4a0f88ee..4a0f88ee 100644
--- a/test/cases/rlparse.d/bstset.h
+++ b/test/rlparse.d/bstset.h
diff --git a/test/cases/rlparse.d/bsttable.h b/test/rlparse.d/bsttable.h
index 4e4babc3..4e4babc3 100644
--- a/test/cases/rlparse.d/bsttable.h
+++ b/test/rlparse.d/bsttable.h
diff --git a/test/cases/rlparse.d/bubblesort.h b/test/rlparse.d/bubblesort.h
index f0f4ce5d..f0f4ce5d 100644
--- a/test/cases/rlparse.d/bubblesort.h
+++ b/test/rlparse.d/bubblesort.h
diff --git a/test/cases/rlparse.d/buffer.h b/test/rlparse.d/buffer.h
index 9c49c1f9..9c49c1f9 100644
--- a/test/cases/rlparse.d/buffer.h
+++ b/test/rlparse.d/buffer.h
diff --git a/test/cases/rlparse.d/case/rlparse.h b/test/rlparse.d/case/rlparse.h
index a2c791e8..a2c791e8 100644
--- a/test/cases/rlparse.d/case/rlparse.h
+++ b/test/rlparse.d/case/rlparse.h
diff --git a/test/cases/rlparse.d/case/rlscan--colm-frontend.exp b/test/rlparse.d/case/rlscan--colm-frontend.exp
index 37c55280..37c55280 100644
--- a/test/cases/rlparse.d/case/rlscan--colm-frontend.exp
+++ b/test/rlparse.d/case/rlscan--colm-frontend.exp
diff --git a/test/cases/rlparse.d/case/rlscan--reduce-frontend.exp b/test/rlparse.d/case/rlscan--reduce-frontend.exp
index 5ae543b7..5ae543b7 100644
--- a/test/cases/rlparse.d/case/rlscan--reduce-frontend.exp
+++ b/test/rlparse.d/case/rlscan--reduce-frontend.exp
diff --git a/test/cases/rlparse.d/case/rlscan.rl b/test/rlparse.d/case/rlscan.rl
index c28a74ad..c28a74ad 100644
--- a/test/cases/rlparse.d/case/rlscan.rl
+++ b/test/rlparse.d/case/rlscan.rl
diff --git a/test/cases/rlparse.d/common.cc b/test/rlparse.d/common.cc
index 39371d6f..39371d6f 100644
--- a/test/cases/rlparse.d/common.cc
+++ b/test/rlparse.d/common.cc
diff --git a/test/cases/rlparse.d/common.h b/test/rlparse.d/common.h
index ea72990f..ea72990f 100644
--- a/test/cases/rlparse.d/common.h
+++ b/test/rlparse.d/common.h
diff --git a/test/cases/rlparse.d/compare.h b/test/rlparse.d/compare.h
index c2768430..c2768430 100644
--- a/test/cases/rlparse.d/compare.h
+++ b/test/rlparse.d/compare.h
diff --git a/test/cases/rlparse.d/config.h b/test/rlparse.d/config.h
index a19b82f8..a19b82f8 100644
--- a/test/cases/rlparse.d/config.h
+++ b/test/rlparse.d/config.h
diff --git a/test/cases/rlparse.d/dlcommon.h b/test/rlparse.d/dlcommon.h
index 91dff25f..91dff25f 100644
--- a/test/cases/rlparse.d/dlcommon.h
+++ b/test/rlparse.d/dlcommon.h
diff --git a/test/cases/rlparse.d/dlist.h b/test/rlparse.d/dlist.h
index e34c8da4..e34c8da4 100644
--- a/test/cases/rlparse.d/dlist.h
+++ b/test/rlparse.d/dlist.h
diff --git a/test/cases/rlparse.d/dlistmel.h b/test/rlparse.d/dlistmel.h
index 17de5432..17de5432 100644
--- a/test/cases/rlparse.d/dlistmel.h
+++ b/test/rlparse.d/dlistmel.h
diff --git a/test/cases/rlparse.d/dlistval.h b/test/rlparse.d/dlistval.h
index 4fcf33fa..4fcf33fa 100644
--- a/test/cases/rlparse.d/dlistval.h
+++ b/test/rlparse.d/dlistval.h
diff --git a/test/cases/rlparse.d/dump.cc b/test/rlparse.d/dump.cc
index d61453d7..d61453d7 100644
--- a/test/cases/rlparse.d/dump.cc
+++ b/test/rlparse.d/dump.cc
diff --git a/test/cases/rlparse.d/fsmap.cc b/test/rlparse.d/fsmap.cc
index 444a12d2..444a12d2 100644
--- a/test/cases/rlparse.d/fsmap.cc
+++ b/test/rlparse.d/fsmap.cc
diff --git a/test/cases/rlparse.d/fsmbase.cc b/test/rlparse.d/fsmbase.cc
index e1dbb5a5..e1dbb5a5 100644
--- a/test/cases/rlparse.d/fsmbase.cc
+++ b/test/rlparse.d/fsmbase.cc
diff --git a/test/cases/rlparse.d/fsmgraph.cc b/test/rlparse.d/fsmgraph.cc
index e998bf11..e998bf11 100644
--- a/test/cases/rlparse.d/fsmgraph.cc
+++ b/test/rlparse.d/fsmgraph.cc
diff --git a/test/cases/rlparse.d/fsmgraph.h b/test/rlparse.d/fsmgraph.h
index 63b6d56e..63b6d56e 100644
--- a/test/cases/rlparse.d/fsmgraph.h
+++ b/test/rlparse.d/fsmgraph.h
diff --git a/test/cases/rlparse.d/gendata.h b/test/rlparse.d/gendata.h
index 2e4bd23a..2e4bd23a 100644
--- a/test/cases/rlparse.d/gendata.h
+++ b/test/rlparse.d/gendata.h
diff --git a/test/cases/rlparse.d/gentests b/test/rlparse.d/gentests
index e64cea15..e64cea15 100755
--- a/test/cases/rlparse.d/gentests
+++ b/test/rlparse.d/gentests
diff --git a/test/cases/rlparse.d/idbase.cc b/test/rlparse.d/idbase.cc
index 856253a9..856253a9 100644
--- a/test/cases/rlparse.d/idbase.cc
+++ b/test/rlparse.d/idbase.cc
diff --git a/test/cases/rlparse.d/inputdata.cc b/test/rlparse.d/inputdata.cc
index 5a68facf..5a68facf 100644
--- a/test/cases/rlparse.d/inputdata.cc
+++ b/test/rlparse.d/inputdata.cc
diff --git a/test/cases/rlparse.d/inputdata.h b/test/rlparse.d/inputdata.h
index 0f256f79..0f256f79 100644
--- a/test/cases/rlparse.d/inputdata.h
+++ b/test/rlparse.d/inputdata.h
diff --git a/test/cases/rlparse.d/load.cc b/test/rlparse.d/load.cc
index 2f5d363f..2f5d363f 100644
--- a/test/cases/rlparse.d/load.cc
+++ b/test/rlparse.d/load.cc
diff --git a/test/cases/rlparse.d/load.h b/test/rlparse.d/load.h
index d3a2fca3..d3a2fca3 100644
--- a/test/cases/rlparse.d/load.h
+++ b/test/rlparse.d/load.h
diff --git a/test/cases/rlparse.d/main.cc b/test/rlparse.d/main.cc
index ec4b444c..ec4b444c 100644
--- a/test/cases/rlparse.d/main.cc
+++ b/test/rlparse.d/main.cc
diff --git a/test/cases/rlparse.d/mergesort.h b/test/rlparse.d/mergesort.h
index 8cefa735..8cefa735 100644
--- a/test/cases/rlparse.d/mergesort.h
+++ b/test/rlparse.d/mergesort.h
diff --git a/test/cases/rlparse.d/parsedata.cc b/test/rlparse.d/parsedata.cc
index 60af8278..60af8278 100644
--- a/test/cases/rlparse.d/parsedata.cc
+++ b/test/rlparse.d/parsedata.cc
diff --git a/test/cases/rlparse.d/parsedata.h b/test/rlparse.d/parsedata.h
index 23c67208..23c67208 100644
--- a/test/cases/rlparse.d/parsedata.h
+++ b/test/rlparse.d/parsedata.h
diff --git a/test/cases/rlparse.d/parsetree.cc b/test/rlparse.d/parsetree.cc
index 26693275..26693275 100644
--- a/test/cases/rlparse.d/parsetree.cc
+++ b/test/rlparse.d/parsetree.cc
diff --git a/test/cases/rlparse.d/parsetree.h b/test/rlparse.d/parsetree.h
index ce259dcd..ce259dcd 100644
--- a/test/cases/rlparse.d/parsetree.h
+++ b/test/rlparse.d/parsetree.h
diff --git a/test/cases/rlparse.d/pcheck.h b/test/rlparse.d/pcheck.h
index 0e388f8a..0e388f8a 100644
--- a/test/cases/rlparse.d/pcheck.h
+++ b/test/rlparse.d/pcheck.h
diff --git a/test/cases/rlparse.d/ragel-c.lm b/test/rlparse.d/ragel-c.lm
index ccc2dc93..ccc2dc93 100644
--- a/test/cases/rlparse.d/ragel-c.lm
+++ b/test/rlparse.d/ragel-c.lm
diff --git a/test/cases/rlparse.d/ragel-crack.lm b/test/rlparse.d/ragel-crack.lm
index b6480012..b6480012 100644
--- a/test/cases/rlparse.d/ragel-crack.lm
+++ b/test/rlparse.d/ragel-crack.lm
diff --git a/test/cases/rlparse.d/ragel-ocaml.lm b/test/rlparse.d/ragel-ocaml.lm
index 2b89535b..2b89535b 100644
--- a/test/cases/rlparse.d/ragel-ocaml.lm
+++ b/test/rlparse.d/ragel-ocaml.lm
diff --git a/test/cases/rlparse.d/ragel-ruby.lm b/test/rlparse.d/ragel-ruby.lm
index 29e36887..29e36887 100644
--- a/test/cases/rlparse.d/ragel-ruby.lm
+++ b/test/rlparse.d/ragel-ruby.lm
diff --git a/test/cases/rlparse.d/ragel.h b/test/rlparse.d/ragel.h
index db26b155..db26b155 100644
--- a/test/cases/rlparse.d/ragel.h
+++ b/test/rlparse.d/ragel.h
diff --git a/test/cases/rlparse.d/ragel.lm b/test/rlparse.d/ragel.lm
index 64d5bb6a..64d5bb6a 100644
--- a/test/cases/rlparse.d/ragel.lm
+++ b/test/rlparse.d/ragel.lm
diff --git a/test/cases/rlparse.d/redfsm.h b/test/rlparse.d/redfsm.h
index a62ca8c8..a62ca8c8 100644
--- a/test/cases/rlparse.d/redfsm.h
+++ b/test/rlparse.d/redfsm.h
diff --git a/test/cases/rlparse.d/reducer.cc b/test/rlparse.d/reducer.cc
index d22b6622..d22b6622 100644
--- a/test/cases/rlparse.d/reducer.cc
+++ b/test/rlparse.d/reducer.cc
diff --git a/test/cases/rlparse.d/reducer.h b/test/rlparse.d/reducer.h
index b5a0dc22..b5a0dc22 100644
--- a/test/cases/rlparse.d/reducer.h
+++ b/test/rlparse.d/reducer.h
diff --git a/test/cases/rlparse.d/reducer.lm b/test/rlparse.d/reducer.lm
index 435cef24..435cef24 100644
--- a/test/cases/rlparse.d/reducer.lm
+++ b/test/rlparse.d/reducer.lm
diff --git a/test/cases/rlparse.d/rlparse.lm b/test/rlparse.d/rlparse.lm
index ddbc683e..ddbc683e 100644
--- a/test/cases/rlparse.d/rlparse.lm
+++ b/test/rlparse.d/rlparse.lm
diff --git a/test/cases/rlparse.d/sbstmap.h b/test/rlparse.d/sbstmap.h
index e3975a1c..e3975a1c 100644
--- a/test/cases/rlparse.d/sbstmap.h
+++ b/test/rlparse.d/sbstmap.h
diff --git a/test/cases/rlparse.d/sbstset.h b/test/rlparse.d/sbstset.h
index 3487ee75..3487ee75 100644
--- a/test/cases/rlparse.d/sbstset.h
+++ b/test/rlparse.d/sbstset.h
diff --git a/test/cases/rlparse.d/sbsttable.h b/test/rlparse.d/sbsttable.h
index 348f1fd0..348f1fd0 100644
--- a/test/cases/rlparse.d/sbsttable.h
+++ b/test/rlparse.d/sbsttable.h
diff --git a/test/cases/rlparse.d/svector.h b/test/rlparse.d/svector.h
index 7dcae62c..7dcae62c 100644
--- a/test/cases/rlparse.d/svector.h
+++ b/test/rlparse.d/svector.h
diff --git a/test/cases/rlparse.d/table.h b/test/rlparse.d/table.h
index c218281b..c218281b 100644
--- a/test/cases/rlparse.d/table.h
+++ b/test/rlparse.d/table.h
diff --git a/test/cases/rlparse.d/vector.h b/test/rlparse.d/vector.h
index b29c7496..b29c7496 100644
--- a/test/cases/rlparse.d/vector.h
+++ b/test/rlparse.d/vector.h
diff --git a/test/cases/rlparse.d/version.h b/test/rlparse.d/version.h
index 6e122ffa..6e122ffa 100644
--- a/test/cases/rlparse.d/version.h
+++ b/test/rlparse.d/version.h
diff --git a/test/cases/trans.d/.gitignore b/test/trans.d/.gitignore
index 9dd4d30c..9dd4d30c 100644
--- a/test/cases/trans.d/.gitignore
+++ b/test/trans.d/.gitignore
diff --git a/test/cases/trans.d/Makefile b/test/trans.d/Makefile
index b831cd2e..b831cd2e 100644
--- a/test/cases/trans.d/Makefile
+++ b/test/trans.d/Makefile
diff --git a/test/cases/trans.d/actparams.cc b/test/trans.d/actparams.cc
index d9e9d6ff..d9e9d6ff 100644
--- a/test/cases/trans.d/actparams.cc
+++ b/test/trans.d/actparams.cc
diff --git a/test/cases/trans.d/case/any1.rl b/test/trans.d/case/any1.rl
index 81ec713c..81ec713c 100644
--- a/test/cases/trans.d/case/any1.rl
+++ b/test/trans.d/case/any1.rl
diff --git a/test/cases/trans.d/case/any1_asm.rl b/test/trans.d/case/any1_asm.rl
index 4a9cc24e..4a9cc24e 100644
--- a/test/cases/trans.d/case/any1_asm.rl
+++ b/test/trans.d/case/any1_asm.rl
diff --git a/test/cases/trans.d/case/any1_c.rl b/test/trans.d/case/any1_c.rl
index 6fbbb85c..6fbbb85c 100644
--- a/test/cases/trans.d/case/any1_c.rl
+++ b/test/trans.d/case/any1_c.rl
diff --git a/test/cases/trans.d/case/any1_crack.rl b/test/trans.d/case/any1_crack.rl
index 8458ae75..8458ae75 100644
--- a/test/cases/trans.d/case/any1_crack.rl
+++ b/test/trans.d/case/any1_crack.rl
diff --git a/test/cases/trans.d/case/any1_cs.rl b/test/trans.d/case/any1_cs.rl
index 33700be9..33700be9 100644
--- a/test/cases/trans.d/case/any1_cs.rl
+++ b/test/trans.d/case/any1_cs.rl
diff --git a/test/cases/trans.d/case/any1_d.rl b/test/trans.d/case/any1_d.rl
index b08bb574..b08bb574 100644
--- a/test/cases/trans.d/case/any1_d.rl
+++ b/test/trans.d/case/any1_d.rl
diff --git a/test/cases/trans.d/case/any1_go.rl b/test/trans.d/case/any1_go.rl
index 71396428..71396428 100644
--- a/test/cases/trans.d/case/any1_go.rl
+++ b/test/trans.d/case/any1_go.rl
diff --git a/test/cases/trans.d/case/any1_java.rl b/test/trans.d/case/any1_java.rl
index ba28d77f..ba28d77f 100644
--- a/test/cases/trans.d/case/any1_java.rl
+++ b/test/trans.d/case/any1_java.rl
diff --git a/test/cases/trans.d/case/any1_julia.rl b/test/trans.d/case/any1_julia.rl
index 40b7387f..40b7387f 100644
--- a/test/cases/trans.d/case/any1_julia.rl
+++ b/test/trans.d/case/any1_julia.rl
diff --git a/test/cases/trans.d/case/any1_ocaml.rl b/test/trans.d/case/any1_ocaml.rl
index d2bd7731..d2bd7731 100644
--- a/test/cases/trans.d/case/any1_ocaml.rl
+++ b/test/trans.d/case/any1_ocaml.rl
diff --git a/test/cases/trans.d/case/any1_ruby.rl b/test/trans.d/case/any1_ruby.rl
index b102b035..b102b035 100644
--- a/test/cases/trans.d/case/any1_ruby.rl
+++ b/test/trans.d/case/any1_ruby.rl
diff --git a/test/cases/trans.d/case/any1_rust.rl b/test/trans.d/case/any1_rust.rl
index fc7939e2..fc7939e2 100644
--- a/test/cases/trans.d/case/any1_rust.rl
+++ b/test/trans.d/case/any1_rust.rl
diff --git a/test/cases/trans.d/case/atoi1.rl b/test/trans.d/case/atoi1.rl
index b56996e5..b56996e5 100644
--- a/test/cases/trans.d/case/atoi1.rl
+++ b/test/trans.d/case/atoi1.rl
diff --git a/test/cases/trans.d/case/atoi1_asm.rl b/test/trans.d/case/atoi1_asm.rl
index 085b5f37..085b5f37 100644
--- a/test/cases/trans.d/case/atoi1_asm.rl
+++ b/test/trans.d/case/atoi1_asm.rl
diff --git a/test/cases/trans.d/case/atoi1_c.rl b/test/trans.d/case/atoi1_c.rl
index 20409ccc..20409ccc 100644
--- a/test/cases/trans.d/case/atoi1_c.rl
+++ b/test/trans.d/case/atoi1_c.rl
diff --git a/test/cases/trans.d/case/atoi1_crack.rl b/test/trans.d/case/atoi1_crack.rl
index 8e3adfcc..8e3adfcc 100644
--- a/test/cases/trans.d/case/atoi1_crack.rl
+++ b/test/trans.d/case/atoi1_crack.rl
diff --git a/test/cases/trans.d/case/atoi1_cs.rl b/test/trans.d/case/atoi1_cs.rl
index 64051f10..64051f10 100644
--- a/test/cases/trans.d/case/atoi1_cs.rl
+++ b/test/trans.d/case/atoi1_cs.rl
diff --git a/test/cases/trans.d/case/atoi1_d.rl b/test/trans.d/case/atoi1_d.rl
index 1d9d0ffa..1d9d0ffa 100644
--- a/test/cases/trans.d/case/atoi1_d.rl
+++ b/test/trans.d/case/atoi1_d.rl
diff --git a/test/cases/trans.d/case/atoi1_go.rl b/test/trans.d/case/atoi1_go.rl
index 0ffa7a1a..0ffa7a1a 100644
--- a/test/cases/trans.d/case/atoi1_go.rl
+++ b/test/trans.d/case/atoi1_go.rl
diff --git a/test/cases/trans.d/case/atoi1_java.rl b/test/trans.d/case/atoi1_java.rl
index 033555d1..033555d1 100644
--- a/test/cases/trans.d/case/atoi1_java.rl
+++ b/test/trans.d/case/atoi1_java.rl
diff --git a/test/cases/trans.d/case/atoi1_julia.rl b/test/trans.d/case/atoi1_julia.rl
index 1576981f..1576981f 100644
--- a/test/cases/trans.d/case/atoi1_julia.rl
+++ b/test/trans.d/case/atoi1_julia.rl
diff --git a/test/cases/trans.d/case/atoi1_ocaml.rl b/test/trans.d/case/atoi1_ocaml.rl
index b0bc8c9f..b0bc8c9f 100644
--- a/test/cases/trans.d/case/atoi1_ocaml.rl
+++ b/test/trans.d/case/atoi1_ocaml.rl
diff --git a/test/cases/trans.d/case/atoi1_ruby.rl b/test/trans.d/case/atoi1_ruby.rl
index c8a67ccc..c8a67ccc 100644
--- a/test/cases/trans.d/case/atoi1_ruby.rl
+++ b/test/trans.d/case/atoi1_ruby.rl
diff --git a/test/cases/trans.d/case/atoi1_rust.rl b/test/trans.d/case/atoi1_rust.rl
index 3af63b7f..3af63b7f 100644
--- a/test/cases/trans.d/case/atoi1_rust.rl
+++ b/test/trans.d/case/atoi1_rust.rl
diff --git a/test/cases/trans.d/case/atoi2.rl b/test/trans.d/case/atoi2.rl
index 9b8cd13c..9b8cd13c 100644
--- a/test/cases/trans.d/case/atoi2.rl
+++ b/test/trans.d/case/atoi2.rl
diff --git a/test/cases/trans.d/case/atoi2_asm.rl b/test/trans.d/case/atoi2_asm.rl
index 51e8eb48..51e8eb48 100644
--- a/test/cases/trans.d/case/atoi2_asm.rl
+++ b/test/trans.d/case/atoi2_asm.rl
diff --git a/test/cases/trans.d/case/atoi2_c.rl b/test/trans.d/case/atoi2_c.rl
index 0a7431fe..0a7431fe 100644
--- a/test/cases/trans.d/case/atoi2_c.rl
+++ b/test/trans.d/case/atoi2_c.rl
diff --git a/test/cases/trans.d/case/atoi2_crack.rl b/test/trans.d/case/atoi2_crack.rl
index cf7123cf..cf7123cf 100644
--- a/test/cases/trans.d/case/atoi2_crack.rl
+++ b/test/trans.d/case/atoi2_crack.rl
diff --git a/test/cases/trans.d/case/atoi2_cs.rl b/test/trans.d/case/atoi2_cs.rl
index b3a182b8..b3a182b8 100644
--- a/test/cases/trans.d/case/atoi2_cs.rl
+++ b/test/trans.d/case/atoi2_cs.rl
diff --git a/test/cases/trans.d/case/atoi2_d.rl b/test/trans.d/case/atoi2_d.rl
index 301cf6fa..301cf6fa 100644
--- a/test/cases/trans.d/case/atoi2_d.rl
+++ b/test/trans.d/case/atoi2_d.rl
diff --git a/test/cases/trans.d/case/atoi2_go.rl b/test/trans.d/case/atoi2_go.rl
index 4ff0d8d9..4ff0d8d9 100644
--- a/test/cases/trans.d/case/atoi2_go.rl
+++ b/test/trans.d/case/atoi2_go.rl
diff --git a/test/cases/trans.d/case/atoi2_java.rl b/test/trans.d/case/atoi2_java.rl
index e26228e3..e26228e3 100644
--- a/test/cases/trans.d/case/atoi2_java.rl
+++ b/test/trans.d/case/atoi2_java.rl
diff --git a/test/cases/trans.d/case/atoi2_julia.rl b/test/trans.d/case/atoi2_julia.rl
index b43e2593..b43e2593 100644
--- a/test/cases/trans.d/case/atoi2_julia.rl
+++ b/test/trans.d/case/atoi2_julia.rl
diff --git a/test/cases/trans.d/case/atoi2_ocaml.rl b/test/trans.d/case/atoi2_ocaml.rl
index 45dc1f6e..45dc1f6e 100644
--- a/test/cases/trans.d/case/atoi2_ocaml.rl
+++ b/test/trans.d/case/atoi2_ocaml.rl
diff --git a/test/cases/trans.d/case/atoi2_ruby.rl b/test/trans.d/case/atoi2_ruby.rl
index 0d86d793..0d86d793 100644
--- a/test/cases/trans.d/case/atoi2_ruby.rl
+++ b/test/trans.d/case/atoi2_ruby.rl
diff --git a/test/cases/trans.d/case/atoi2_rust.rl b/test/trans.d/case/atoi2_rust.rl
index 5510068a..5510068a 100644
--- a/test/cases/trans.d/case/atoi2_rust.rl
+++ b/test/trans.d/case/atoi2_rust.rl
diff --git a/test/cases/trans.d/case/call4.rl b/test/trans.d/case/call4.rl
index 72edf30e..72edf30e 100644
--- a/test/cases/trans.d/case/call4.rl
+++ b/test/trans.d/case/call4.rl
diff --git a/test/cases/trans.d/case/call4_asm.rl b/test/trans.d/case/call4_asm.rl
index 70e816ed..70e816ed 100644
--- a/test/cases/trans.d/case/call4_asm.rl
+++ b/test/trans.d/case/call4_asm.rl
diff --git a/test/cases/trans.d/case/call4_c.rl b/test/trans.d/case/call4_c.rl
index e8002904..e8002904 100644
--- a/test/cases/trans.d/case/call4_c.rl
+++ b/test/trans.d/case/call4_c.rl
diff --git a/test/cases/trans.d/case/call4_crack.rl b/test/trans.d/case/call4_crack.rl
index ecac128b..ecac128b 100644
--- a/test/cases/trans.d/case/call4_crack.rl
+++ b/test/trans.d/case/call4_crack.rl
diff --git a/test/cases/trans.d/case/call4_cs.rl b/test/trans.d/case/call4_cs.rl
index 19f01958..19f01958 100644
--- a/test/cases/trans.d/case/call4_cs.rl
+++ b/test/trans.d/case/call4_cs.rl
diff --git a/test/cases/trans.d/case/call4_d.rl b/test/trans.d/case/call4_d.rl
index b187ce85..b187ce85 100644
--- a/test/cases/trans.d/case/call4_d.rl
+++ b/test/trans.d/case/call4_d.rl
diff --git a/test/cases/trans.d/case/call4_go.rl b/test/trans.d/case/call4_go.rl
index 886f3031..886f3031 100644
--- a/test/cases/trans.d/case/call4_go.rl
+++ b/test/trans.d/case/call4_go.rl
diff --git a/test/cases/trans.d/case/call4_java.rl b/test/trans.d/case/call4_java.rl
index 5bdf9a3f..5bdf9a3f 100644
--- a/test/cases/trans.d/case/call4_java.rl
+++ b/test/trans.d/case/call4_java.rl
diff --git a/test/cases/trans.d/case/call4_julia.rl b/test/trans.d/case/call4_julia.rl
index 263e65d6..263e65d6 100644
--- a/test/cases/trans.d/case/call4_julia.rl
+++ b/test/trans.d/case/call4_julia.rl
diff --git a/test/cases/trans.d/case/call4_rust.rl b/test/trans.d/case/call4_rust.rl
index f9d24550..f9d24550 100644
--- a/test/cases/trans.d/case/call4_rust.rl
+++ b/test/trans.d/case/call4_rust.rl
diff --git a/test/cases/trans.d/case/caseindep.rl b/test/trans.d/case/caseindep.rl
index d3bd188c..d3bd188c 100644
--- a/test/cases/trans.d/case/caseindep.rl
+++ b/test/trans.d/case/caseindep.rl
diff --git a/test/cases/trans.d/case/caseindep_asm.rl b/test/trans.d/case/caseindep_asm.rl
index bc4aca8f..bc4aca8f 100644
--- a/test/cases/trans.d/case/caseindep_asm.rl
+++ b/test/trans.d/case/caseindep_asm.rl
diff --git a/test/cases/trans.d/case/caseindep_c.rl b/test/trans.d/case/caseindep_c.rl
index a0771ae0..a0771ae0 100644
--- a/test/cases/trans.d/case/caseindep_c.rl
+++ b/test/trans.d/case/caseindep_c.rl
diff --git a/test/cases/trans.d/case/caseindep_crack.rl b/test/trans.d/case/caseindep_crack.rl
index a4c2bf8a..a4c2bf8a 100644
--- a/test/cases/trans.d/case/caseindep_crack.rl
+++ b/test/trans.d/case/caseindep_crack.rl
diff --git a/test/cases/trans.d/case/caseindep_cs.rl b/test/trans.d/case/caseindep_cs.rl
index 404be8f1..404be8f1 100644
--- a/test/cases/trans.d/case/caseindep_cs.rl
+++ b/test/trans.d/case/caseindep_cs.rl
diff --git a/test/cases/trans.d/case/caseindep_d.rl b/test/trans.d/case/caseindep_d.rl
index dc666dd9..dc666dd9 100644
--- a/test/cases/trans.d/case/caseindep_d.rl
+++ b/test/trans.d/case/caseindep_d.rl
diff --git a/test/cases/trans.d/case/caseindep_go.rl b/test/trans.d/case/caseindep_go.rl
index 106751a8..106751a8 100644
--- a/test/cases/trans.d/case/caseindep_go.rl
+++ b/test/trans.d/case/caseindep_go.rl
diff --git a/test/cases/trans.d/case/caseindep_java.rl b/test/trans.d/case/caseindep_java.rl
index 2156fe34..2156fe34 100644
--- a/test/cases/trans.d/case/caseindep_java.rl
+++ b/test/trans.d/case/caseindep_java.rl
diff --git a/test/cases/trans.d/case/caseindep_julia.rl b/test/trans.d/case/caseindep_julia.rl
index 9a39658a..9a39658a 100644
--- a/test/cases/trans.d/case/caseindep_julia.rl
+++ b/test/trans.d/case/caseindep_julia.rl
diff --git a/test/cases/trans.d/case/caseindep_ocaml.rl b/test/trans.d/case/caseindep_ocaml.rl
index 90aedfc4..90aedfc4 100644
--- a/test/cases/trans.d/case/caseindep_ocaml.rl
+++ b/test/trans.d/case/caseindep_ocaml.rl
diff --git a/test/cases/trans.d/case/caseindep_ruby.rl b/test/trans.d/case/caseindep_ruby.rl
index 3d21d0c9..3d21d0c9 100644
--- a/test/cases/trans.d/case/caseindep_ruby.rl
+++ b/test/trans.d/case/caseindep_ruby.rl
diff --git a/test/cases/trans.d/case/caseindep_rust.rl b/test/trans.d/case/caseindep_rust.rl
index 281a9af5..281a9af5 100644
--- a/test/cases/trans.d/case/caseindep_rust.rl
+++ b/test/trans.d/case/caseindep_rust.rl
diff --git a/test/cases/trans.d/case/clang4.rl b/test/trans.d/case/clang4.rl
index b033a479..b033a479 100644
--- a/test/cases/trans.d/case/clang4.rl
+++ b/test/trans.d/case/clang4.rl
diff --git a/test/cases/trans.d/case/clang4_asm.rl b/test/trans.d/case/clang4_asm.rl
index 882cd148..882cd148 100644
--- a/test/cases/trans.d/case/clang4_asm.rl
+++ b/test/trans.d/case/clang4_asm.rl
diff --git a/test/cases/trans.d/case/clang4_c.rl b/test/trans.d/case/clang4_c.rl
index b64d027a..b64d027a 100644
--- a/test/cases/trans.d/case/clang4_c.rl
+++ b/test/trans.d/case/clang4_c.rl
diff --git a/test/cases/trans.d/case/clang4_crack.rl b/test/trans.d/case/clang4_crack.rl
index c15c5c60..c15c5c60 100644
--- a/test/cases/trans.d/case/clang4_crack.rl
+++ b/test/trans.d/case/clang4_crack.rl
diff --git a/test/cases/trans.d/case/clang4_cs.rl b/test/trans.d/case/clang4_cs.rl
index 19bcdc9a..19bcdc9a 100644
--- a/test/cases/trans.d/case/clang4_cs.rl
+++ b/test/trans.d/case/clang4_cs.rl
diff --git a/test/cases/trans.d/case/clang4_d.rl b/test/trans.d/case/clang4_d.rl
index 3c890ca3..3c890ca3 100644
--- a/test/cases/trans.d/case/clang4_d.rl
+++ b/test/trans.d/case/clang4_d.rl
diff --git a/test/cases/trans.d/case/clang4_go.rl b/test/trans.d/case/clang4_go.rl
index bbdd169e..bbdd169e 100644
--- a/test/cases/trans.d/case/clang4_go.rl
+++ b/test/trans.d/case/clang4_go.rl
diff --git a/test/cases/trans.d/case/clang4_java.rl b/test/trans.d/case/clang4_java.rl
index cd5e9b93..cd5e9b93 100644
--- a/test/cases/trans.d/case/clang4_java.rl
+++ b/test/trans.d/case/clang4_java.rl
diff --git a/test/cases/trans.d/case/clang4_julia.rl b/test/trans.d/case/clang4_julia.rl
index 86094bbb..86094bbb 100644
--- a/test/cases/trans.d/case/clang4_julia.rl
+++ b/test/trans.d/case/clang4_julia.rl
diff --git a/test/cases/trans.d/case/clang4_ocaml.rl b/test/trans.d/case/clang4_ocaml.rl
index d9689faf..d9689faf 100644
--- a/test/cases/trans.d/case/clang4_ocaml.rl
+++ b/test/trans.d/case/clang4_ocaml.rl
diff --git a/test/cases/trans.d/case/clang4_ruby.rl b/test/trans.d/case/clang4_ruby.rl
index 383d6d34..383d6d34 100644
--- a/test/cases/trans.d/case/clang4_ruby.rl
+++ b/test/trans.d/case/clang4_ruby.rl
diff --git a/test/cases/trans.d/case/clang4_rust.rl b/test/trans.d/case/clang4_rust.rl
index b77a8aec..b77a8aec 100644
--- a/test/cases/trans.d/case/clang4_rust.rl
+++ b/test/trans.d/case/clang4_rust.rl
diff --git a/test/cases/trans.d/case/cond1.rl b/test/trans.d/case/cond1.rl
index cd96c0ec..cd96c0ec 100644
--- a/test/cases/trans.d/case/cond1.rl
+++ b/test/trans.d/case/cond1.rl
diff --git a/test/cases/trans.d/case/cond1_asm.rl b/test/trans.d/case/cond1_asm.rl
index 82904376..82904376 100644
--- a/test/cases/trans.d/case/cond1_asm.rl
+++ b/test/trans.d/case/cond1_asm.rl
diff --git a/test/cases/trans.d/case/cond1_c.rl b/test/trans.d/case/cond1_c.rl
index 4ec07430..4ec07430 100644
--- a/test/cases/trans.d/case/cond1_c.rl
+++ b/test/trans.d/case/cond1_c.rl
diff --git a/test/cases/trans.d/case/cond1_crack.rl b/test/trans.d/case/cond1_crack.rl
index cfab3d11..cfab3d11 100644
--- a/test/cases/trans.d/case/cond1_crack.rl
+++ b/test/trans.d/case/cond1_crack.rl
diff --git a/test/cases/trans.d/case/cond1_cs.rl b/test/trans.d/case/cond1_cs.rl
index 5b1c2b42..5b1c2b42 100644
--- a/test/cases/trans.d/case/cond1_cs.rl
+++ b/test/trans.d/case/cond1_cs.rl
diff --git a/test/cases/trans.d/case/cond1_d.rl b/test/trans.d/case/cond1_d.rl
index 113bdc36..113bdc36 100644
--- a/test/cases/trans.d/case/cond1_d.rl
+++ b/test/trans.d/case/cond1_d.rl
diff --git a/test/cases/trans.d/case/cond1_go.rl b/test/trans.d/case/cond1_go.rl
index 20904188..20904188 100644
--- a/test/cases/trans.d/case/cond1_go.rl
+++ b/test/trans.d/case/cond1_go.rl
diff --git a/test/cases/trans.d/case/cond1_java.rl b/test/trans.d/case/cond1_java.rl
index a49f1844..a49f1844 100644
--- a/test/cases/trans.d/case/cond1_java.rl
+++ b/test/trans.d/case/cond1_java.rl
diff --git a/test/cases/trans.d/case/cond1_julia.rl b/test/trans.d/case/cond1_julia.rl
index ca40d50c..ca40d50c 100644
--- a/test/cases/trans.d/case/cond1_julia.rl
+++ b/test/trans.d/case/cond1_julia.rl
diff --git a/test/cases/trans.d/case/cond1_ocaml.rl b/test/trans.d/case/cond1_ocaml.rl
index 4c01cd53..4c01cd53 100644
--- a/test/cases/trans.d/case/cond1_ocaml.rl
+++ b/test/trans.d/case/cond1_ocaml.rl
diff --git a/test/cases/trans.d/case/cond1_ruby.rl b/test/trans.d/case/cond1_ruby.rl
index cfbfbcb0..cfbfbcb0 100644
--- a/test/cases/trans.d/case/cond1_ruby.rl
+++ b/test/trans.d/case/cond1_ruby.rl
diff --git a/test/cases/trans.d/case/cond1_rust.rl b/test/trans.d/case/cond1_rust.rl
index 829da378..829da378 100644
--- a/test/cases/trans.d/case/cond1_rust.rl
+++ b/test/trans.d/case/cond1_rust.rl
diff --git a/test/cases/trans.d/case/cond7.rl b/test/trans.d/case/cond7.rl
index 2fb66b4b..2fb66b4b 100644
--- a/test/cases/trans.d/case/cond7.rl
+++ b/test/trans.d/case/cond7.rl
diff --git a/test/cases/trans.d/case/cond7_asm.rl b/test/trans.d/case/cond7_asm.rl
index f3d4de57..f3d4de57 100644
--- a/test/cases/trans.d/case/cond7_asm.rl
+++ b/test/trans.d/case/cond7_asm.rl
diff --git a/test/cases/trans.d/case/cond7_c.rl b/test/trans.d/case/cond7_c.rl
index 506b2207..506b2207 100644
--- a/test/cases/trans.d/case/cond7_c.rl
+++ b/test/trans.d/case/cond7_c.rl
diff --git a/test/cases/trans.d/case/cond7_crack.rl b/test/trans.d/case/cond7_crack.rl
index e2beed73..e2beed73 100644
--- a/test/cases/trans.d/case/cond7_crack.rl
+++ b/test/trans.d/case/cond7_crack.rl
diff --git a/test/cases/trans.d/case/cond7_cs.rl b/test/trans.d/case/cond7_cs.rl
index 006397fe..006397fe 100644
--- a/test/cases/trans.d/case/cond7_cs.rl
+++ b/test/trans.d/case/cond7_cs.rl
diff --git a/test/cases/trans.d/case/cond7_d.rl b/test/trans.d/case/cond7_d.rl
index 90cc2a8c..90cc2a8c 100644
--- a/test/cases/trans.d/case/cond7_d.rl
+++ b/test/trans.d/case/cond7_d.rl
diff --git a/test/cases/trans.d/case/cond7_go.rl b/test/trans.d/case/cond7_go.rl
index a3e700bc..a3e700bc 100644
--- a/test/cases/trans.d/case/cond7_go.rl
+++ b/test/trans.d/case/cond7_go.rl
diff --git a/test/cases/trans.d/case/cond7_java.rl b/test/trans.d/case/cond7_java.rl
index 156a77d7..156a77d7 100644
--- a/test/cases/trans.d/case/cond7_java.rl
+++ b/test/trans.d/case/cond7_java.rl
diff --git a/test/cases/trans.d/case/cond7_julia.rl b/test/trans.d/case/cond7_julia.rl
index 924c3b25..924c3b25 100644
--- a/test/cases/trans.d/case/cond7_julia.rl
+++ b/test/trans.d/case/cond7_julia.rl
diff --git a/test/cases/trans.d/case/cond7_ocaml.rl b/test/trans.d/case/cond7_ocaml.rl
index e559fdec..e559fdec 100644
--- a/test/cases/trans.d/case/cond7_ocaml.rl
+++ b/test/trans.d/case/cond7_ocaml.rl
diff --git a/test/cases/trans.d/case/cond7_ruby.rl b/test/trans.d/case/cond7_ruby.rl
index a2970258..a2970258 100644
--- a/test/cases/trans.d/case/cond7_ruby.rl
+++ b/test/trans.d/case/cond7_ruby.rl
diff --git a/test/cases/trans.d/case/cond7_rust.rl b/test/trans.d/case/cond7_rust.rl
index 97e86165..97e86165 100644
--- a/test/cases/trans.d/case/cond7_rust.rl
+++ b/test/trans.d/case/cond7_rust.rl
diff --git a/test/cases/trans.d/case/cppscan6.rl b/test/trans.d/case/cppscan6.rl
index 05824150..05824150 100644
--- a/test/cases/trans.d/case/cppscan6.rl
+++ b/test/trans.d/case/cppscan6.rl
diff --git a/test/cases/trans.d/case/cppscan6_asm.rl b/test/trans.d/case/cppscan6_asm.rl
index 8e9a211a..8e9a211a 100644
--- a/test/cases/trans.d/case/cppscan6_asm.rl
+++ b/test/trans.d/case/cppscan6_asm.rl
diff --git a/test/cases/trans.d/case/cppscan6_c.rl b/test/trans.d/case/cppscan6_c.rl
index bc774d92..bc774d92 100644
--- a/test/cases/trans.d/case/cppscan6_c.rl
+++ b/test/trans.d/case/cppscan6_c.rl
diff --git a/test/cases/trans.d/case/cppscan6_crack.rl b/test/trans.d/case/cppscan6_crack.rl
index 5cf24759..5cf24759 100644
--- a/test/cases/trans.d/case/cppscan6_crack.rl
+++ b/test/trans.d/case/cppscan6_crack.rl
diff --git a/test/cases/trans.d/case/cppscan6_cs.rl b/test/trans.d/case/cppscan6_cs.rl
index 11116bba..11116bba 100644
--- a/test/cases/trans.d/case/cppscan6_cs.rl
+++ b/test/trans.d/case/cppscan6_cs.rl
diff --git a/test/cases/trans.d/case/cppscan6_d.rl b/test/trans.d/case/cppscan6_d.rl
index f0deb0d7..f0deb0d7 100644
--- a/test/cases/trans.d/case/cppscan6_d.rl
+++ b/test/trans.d/case/cppscan6_d.rl
diff --git a/test/cases/trans.d/case/cppscan6_go.rl b/test/trans.d/case/cppscan6_go.rl
index 1616a67f..1616a67f 100644
--- a/test/cases/trans.d/case/cppscan6_go.rl
+++ b/test/trans.d/case/cppscan6_go.rl
diff --git a/test/cases/trans.d/case/cppscan6_java.rl b/test/trans.d/case/cppscan6_java.rl
index fbad9117..fbad9117 100644
--- a/test/cases/trans.d/case/cppscan6_java.rl
+++ b/test/trans.d/case/cppscan6_java.rl
diff --git a/test/cases/trans.d/case/cppscan6_julia.rl b/test/trans.d/case/cppscan6_julia.rl
index ff1dcac4..ff1dcac4 100644
--- a/test/cases/trans.d/case/cppscan6_julia.rl
+++ b/test/trans.d/case/cppscan6_julia.rl
diff --git a/test/cases/trans.d/case/cppscan6_ocaml.rl b/test/trans.d/case/cppscan6_ocaml.rl
index c6af74dc..c6af74dc 100644
--- a/test/cases/trans.d/case/cppscan6_ocaml.rl
+++ b/test/trans.d/case/cppscan6_ocaml.rl
diff --git a/test/cases/trans.d/case/cppscan6_ruby.rl b/test/trans.d/case/cppscan6_ruby.rl
index 58079620..58079620 100644
--- a/test/cases/trans.d/case/cppscan6_ruby.rl
+++ b/test/trans.d/case/cppscan6_ruby.rl
diff --git a/test/cases/trans.d/case/cppscan6_rust.rl b/test/trans.d/case/cppscan6_rust.rl
index edd821c6..edd821c6 100644
--- a/test/cases/trans.d/case/cppscan6_rust.rl
+++ b/test/trans.d/case/cppscan6_rust.rl
diff --git a/test/cases/trans.d/case/curs1.rl b/test/trans.d/case/curs1.rl
index 71c5c43c..71c5c43c 100644
--- a/test/cases/trans.d/case/curs1.rl
+++ b/test/trans.d/case/curs1.rl
diff --git a/test/cases/trans.d/case/curs1_asm.rl b/test/trans.d/case/curs1_asm.rl
index 8b71c052..8b71c052 100644
--- a/test/cases/trans.d/case/curs1_asm.rl
+++ b/test/trans.d/case/curs1_asm.rl
diff --git a/test/cases/trans.d/case/curs1_c.rl b/test/trans.d/case/curs1_c.rl
index 781aa33e..781aa33e 100644
--- a/test/cases/trans.d/case/curs1_c.rl
+++ b/test/trans.d/case/curs1_c.rl
diff --git a/test/cases/trans.d/case/curs1_crack.rl b/test/trans.d/case/curs1_crack.rl
index f1b1126d..f1b1126d 100644
--- a/test/cases/trans.d/case/curs1_crack.rl
+++ b/test/trans.d/case/curs1_crack.rl
diff --git a/test/cases/trans.d/case/curs1_cs.rl b/test/trans.d/case/curs1_cs.rl
index fe525f85..fe525f85 100644
--- a/test/cases/trans.d/case/curs1_cs.rl
+++ b/test/trans.d/case/curs1_cs.rl
diff --git a/test/cases/trans.d/case/curs1_d.rl b/test/trans.d/case/curs1_d.rl
index 3bce97a4..3bce97a4 100644
--- a/test/cases/trans.d/case/curs1_d.rl
+++ b/test/trans.d/case/curs1_d.rl
diff --git a/test/cases/trans.d/case/curs1_go.rl b/test/trans.d/case/curs1_go.rl
index 1c9058a2..1c9058a2 100644
--- a/test/cases/trans.d/case/curs1_go.rl
+++ b/test/trans.d/case/curs1_go.rl
diff --git a/test/cases/trans.d/case/curs1_java.rl b/test/trans.d/case/curs1_java.rl
index c44dd6c1..c44dd6c1 100644
--- a/test/cases/trans.d/case/curs1_java.rl
+++ b/test/trans.d/case/curs1_java.rl
diff --git a/test/cases/trans.d/case/curs1_julia.rl b/test/trans.d/case/curs1_julia.rl
index 10972c82..10972c82 100644
--- a/test/cases/trans.d/case/curs1_julia.rl
+++ b/test/trans.d/case/curs1_julia.rl
diff --git a/test/cases/trans.d/case/curs1_ocaml.rl b/test/trans.d/case/curs1_ocaml.rl
index b79dc73e..b79dc73e 100644
--- a/test/cases/trans.d/case/curs1_ocaml.rl
+++ b/test/trans.d/case/curs1_ocaml.rl
diff --git a/test/cases/trans.d/case/curs1_ruby.rl b/test/trans.d/case/curs1_ruby.rl
index dfa48b2f..dfa48b2f 100644
--- a/test/cases/trans.d/case/curs1_ruby.rl
+++ b/test/trans.d/case/curs1_ruby.rl
diff --git a/test/cases/trans.d/case/curs1_rust.rl b/test/trans.d/case/curs1_rust.rl
index 3c666c45..3c666c45 100644
--- a/test/cases/trans.d/case/curs1_rust.rl
+++ b/test/trans.d/case/curs1_rust.rl
diff --git a/test/cases/trans.d/case/empty1.rl b/test/trans.d/case/empty1.rl
index 39078902..39078902 100644
--- a/test/cases/trans.d/case/empty1.rl
+++ b/test/trans.d/case/empty1.rl
diff --git a/test/cases/trans.d/case/empty1_asm.rl b/test/trans.d/case/empty1_asm.rl
index 5f283c9c..5f283c9c 100644
--- a/test/cases/trans.d/case/empty1_asm.rl
+++ b/test/trans.d/case/empty1_asm.rl
diff --git a/test/cases/trans.d/case/empty1_c.rl b/test/trans.d/case/empty1_c.rl
index be0b4917..be0b4917 100644
--- a/test/cases/trans.d/case/empty1_c.rl
+++ b/test/trans.d/case/empty1_c.rl
diff --git a/test/cases/trans.d/case/empty1_crack.rl b/test/trans.d/case/empty1_crack.rl
index f9ef6600..f9ef6600 100644
--- a/test/cases/trans.d/case/empty1_crack.rl
+++ b/test/trans.d/case/empty1_crack.rl
diff --git a/test/cases/trans.d/case/empty1_cs.rl b/test/trans.d/case/empty1_cs.rl
index b1c493aa..b1c493aa 100644
--- a/test/cases/trans.d/case/empty1_cs.rl
+++ b/test/trans.d/case/empty1_cs.rl
diff --git a/test/cases/trans.d/case/empty1_d.rl b/test/trans.d/case/empty1_d.rl
index 3593f520..3593f520 100644
--- a/test/cases/trans.d/case/empty1_d.rl
+++ b/test/trans.d/case/empty1_d.rl
diff --git a/test/cases/trans.d/case/empty1_go.rl b/test/trans.d/case/empty1_go.rl
index b3d535c1..b3d535c1 100644
--- a/test/cases/trans.d/case/empty1_go.rl
+++ b/test/trans.d/case/empty1_go.rl
diff --git a/test/cases/trans.d/case/empty1_java.rl b/test/trans.d/case/empty1_java.rl
index 54f354c3..54f354c3 100644
--- a/test/cases/trans.d/case/empty1_java.rl
+++ b/test/trans.d/case/empty1_java.rl
diff --git a/test/cases/trans.d/case/empty1_julia.rl b/test/trans.d/case/empty1_julia.rl
index 7935b34d..7935b34d 100644
--- a/test/cases/trans.d/case/empty1_julia.rl
+++ b/test/trans.d/case/empty1_julia.rl
diff --git a/test/cases/trans.d/case/empty1_ocaml.rl b/test/trans.d/case/empty1_ocaml.rl
index f9e0249d..f9e0249d 100644
--- a/test/cases/trans.d/case/empty1_ocaml.rl
+++ b/test/trans.d/case/empty1_ocaml.rl
diff --git a/test/cases/trans.d/case/empty1_ruby.rl b/test/trans.d/case/empty1_ruby.rl
index 340af2bc..340af2bc 100644
--- a/test/cases/trans.d/case/empty1_ruby.rl
+++ b/test/trans.d/case/empty1_ruby.rl
diff --git a/test/cases/trans.d/case/empty1_rust.rl b/test/trans.d/case/empty1_rust.rl
index af89c9a7..af89c9a7 100644
--- a/test/cases/trans.d/case/empty1_rust.rl
+++ b/test/trans.d/case/empty1_rust.rl
diff --git a/test/cases/trans.d/case/eofact.rl b/test/trans.d/case/eofact.rl
index 83ad2a7e..83ad2a7e 100644
--- a/test/cases/trans.d/case/eofact.rl
+++ b/test/trans.d/case/eofact.rl
diff --git a/test/cases/trans.d/case/eofact_asm.rl b/test/trans.d/case/eofact_asm.rl
index 22937aed..22937aed 100644
--- a/test/cases/trans.d/case/eofact_asm.rl
+++ b/test/trans.d/case/eofact_asm.rl
diff --git a/test/cases/trans.d/case/eofact_c.rl b/test/trans.d/case/eofact_c.rl
index 65bd9b9d..65bd9b9d 100644
--- a/test/cases/trans.d/case/eofact_c.rl
+++ b/test/trans.d/case/eofact_c.rl
diff --git a/test/cases/trans.d/case/eofact_crack.rl b/test/trans.d/case/eofact_crack.rl
index eb2e924a..eb2e924a 100644
--- a/test/cases/trans.d/case/eofact_crack.rl
+++ b/test/trans.d/case/eofact_crack.rl
diff --git a/test/cases/trans.d/case/eofact_cs.rl b/test/trans.d/case/eofact_cs.rl
index a1918623..a1918623 100644
--- a/test/cases/trans.d/case/eofact_cs.rl
+++ b/test/trans.d/case/eofact_cs.rl
diff --git a/test/cases/trans.d/case/eofact_d.rl b/test/trans.d/case/eofact_d.rl
index 5c975f0f..5c975f0f 100644
--- a/test/cases/trans.d/case/eofact_d.rl
+++ b/test/trans.d/case/eofact_d.rl
diff --git a/test/cases/trans.d/case/eofact_go.rl b/test/trans.d/case/eofact_go.rl
index caa7d707..caa7d707 100644
--- a/test/cases/trans.d/case/eofact_go.rl
+++ b/test/trans.d/case/eofact_go.rl
diff --git a/test/cases/trans.d/case/eofact_java.rl b/test/trans.d/case/eofact_java.rl
index 9496714c..9496714c 100644
--- a/test/cases/trans.d/case/eofact_java.rl
+++ b/test/trans.d/case/eofact_java.rl
diff --git a/test/cases/trans.d/case/eofact_julia.rl b/test/trans.d/case/eofact_julia.rl
index 4b3eecd7..4b3eecd7 100644
--- a/test/cases/trans.d/case/eofact_julia.rl
+++ b/test/trans.d/case/eofact_julia.rl
diff --git a/test/cases/trans.d/case/eofact_ocaml.rl b/test/trans.d/case/eofact_ocaml.rl
index e8579c32..e8579c32 100644
--- a/test/cases/trans.d/case/eofact_ocaml.rl
+++ b/test/trans.d/case/eofact_ocaml.rl
diff --git a/test/cases/trans.d/case/eofact_ruby.rl b/test/trans.d/case/eofact_ruby.rl
index 6cd5f4e5..6cd5f4e5 100644
--- a/test/cases/trans.d/case/eofact_ruby.rl
+++ b/test/trans.d/case/eofact_ruby.rl
diff --git a/test/cases/trans.d/case/eofact_rust.rl b/test/trans.d/case/eofact_rust.rl
index 5c8492dd..5c8492dd 100644
--- a/test/cases/trans.d/case/eofact_rust.rl
+++ b/test/trans.d/case/eofact_rust.rl
diff --git a/test/cases/trans.d/case/erract2.rl b/test/trans.d/case/erract2.rl
index f6007151..f6007151 100644
--- a/test/cases/trans.d/case/erract2.rl
+++ b/test/trans.d/case/erract2.rl
diff --git a/test/cases/trans.d/case/erract2_asm.rl b/test/trans.d/case/erract2_asm.rl
index 11e74664..11e74664 100644
--- a/test/cases/trans.d/case/erract2_asm.rl
+++ b/test/trans.d/case/erract2_asm.rl
diff --git a/test/cases/trans.d/case/erract2_c.rl b/test/trans.d/case/erract2_c.rl
index be05030f..be05030f 100644
--- a/test/cases/trans.d/case/erract2_c.rl
+++ b/test/trans.d/case/erract2_c.rl
diff --git a/test/cases/trans.d/case/erract2_crack.rl b/test/trans.d/case/erract2_crack.rl
index 0d419cad..0d419cad 100644
--- a/test/cases/trans.d/case/erract2_crack.rl
+++ b/test/trans.d/case/erract2_crack.rl
diff --git a/test/cases/trans.d/case/erract2_cs.rl b/test/trans.d/case/erract2_cs.rl
index 3a264143..3a264143 100644
--- a/test/cases/trans.d/case/erract2_cs.rl
+++ b/test/trans.d/case/erract2_cs.rl
diff --git a/test/cases/trans.d/case/erract2_d.rl b/test/trans.d/case/erract2_d.rl
index a6ca6d77..a6ca6d77 100644
--- a/test/cases/trans.d/case/erract2_d.rl
+++ b/test/trans.d/case/erract2_d.rl
diff --git a/test/cases/trans.d/case/erract2_go.rl b/test/trans.d/case/erract2_go.rl
index c7ba0989..c7ba0989 100644
--- a/test/cases/trans.d/case/erract2_go.rl
+++ b/test/trans.d/case/erract2_go.rl
diff --git a/test/cases/trans.d/case/erract2_java.rl b/test/trans.d/case/erract2_java.rl
index edda48fa..edda48fa 100644
--- a/test/cases/trans.d/case/erract2_java.rl
+++ b/test/trans.d/case/erract2_java.rl
diff --git a/test/cases/trans.d/case/erract2_julia.rl b/test/trans.d/case/erract2_julia.rl
index c8312cba..c8312cba 100644
--- a/test/cases/trans.d/case/erract2_julia.rl
+++ b/test/trans.d/case/erract2_julia.rl
diff --git a/test/cases/trans.d/case/erract2_ocaml.rl b/test/trans.d/case/erract2_ocaml.rl
index dfeeaf5e..dfeeaf5e 100644
--- a/test/cases/trans.d/case/erract2_ocaml.rl
+++ b/test/trans.d/case/erract2_ocaml.rl
diff --git a/test/cases/trans.d/case/erract2_ruby.rl b/test/trans.d/case/erract2_ruby.rl
index 0e65e2c0..0e65e2c0 100644
--- a/test/cases/trans.d/case/erract2_ruby.rl
+++ b/test/trans.d/case/erract2_ruby.rl
diff --git a/test/cases/trans.d/case/erract2_rust.rl b/test/trans.d/case/erract2_rust.rl
index e541df3c..e541df3c 100644
--- a/test/cases/trans.d/case/erract2_rust.rl
+++ b/test/trans.d/case/erract2_rust.rl
diff --git a/test/cases/trans.d/case/goto1.rl b/test/trans.d/case/goto1.rl
index 4b9385bd..4b9385bd 100644
--- a/test/cases/trans.d/case/goto1.rl
+++ b/test/trans.d/case/goto1.rl
diff --git a/test/cases/trans.d/case/goto1_asm.rl b/test/trans.d/case/goto1_asm.rl
index f92f45a6..f92f45a6 100644
--- a/test/cases/trans.d/case/goto1_asm.rl
+++ b/test/trans.d/case/goto1_asm.rl
diff --git a/test/cases/trans.d/case/goto1_c.rl b/test/trans.d/case/goto1_c.rl
index 729c5c5a..729c5c5a 100644
--- a/test/cases/trans.d/case/goto1_c.rl
+++ b/test/trans.d/case/goto1_c.rl
diff --git a/test/cases/trans.d/case/goto1_crack.rl b/test/trans.d/case/goto1_crack.rl
index 6a124918..6a124918 100644
--- a/test/cases/trans.d/case/goto1_crack.rl
+++ b/test/trans.d/case/goto1_crack.rl
diff --git a/test/cases/trans.d/case/goto1_cs.rl b/test/trans.d/case/goto1_cs.rl
index bf95503a..bf95503a 100644
--- a/test/cases/trans.d/case/goto1_cs.rl
+++ b/test/trans.d/case/goto1_cs.rl
diff --git a/test/cases/trans.d/case/goto1_d.rl b/test/trans.d/case/goto1_d.rl
index dc7979cd..dc7979cd 100644
--- a/test/cases/trans.d/case/goto1_d.rl
+++ b/test/trans.d/case/goto1_d.rl
diff --git a/test/cases/trans.d/case/goto1_go.rl b/test/trans.d/case/goto1_go.rl
index ba6df377..ba6df377 100644
--- a/test/cases/trans.d/case/goto1_go.rl
+++ b/test/trans.d/case/goto1_go.rl
diff --git a/test/cases/trans.d/case/goto1_java.rl b/test/trans.d/case/goto1_java.rl
index 668faaf7..668faaf7 100644
--- a/test/cases/trans.d/case/goto1_java.rl
+++ b/test/trans.d/case/goto1_java.rl
diff --git a/test/cases/trans.d/case/goto1_julia.rl b/test/trans.d/case/goto1_julia.rl
index 33bc2a6d..33bc2a6d 100644
--- a/test/cases/trans.d/case/goto1_julia.rl
+++ b/test/trans.d/case/goto1_julia.rl
diff --git a/test/cases/trans.d/case/goto1_rust.rl b/test/trans.d/case/goto1_rust.rl
index ac7e4ee8..ac7e4ee8 100644
--- a/test/cases/trans.d/case/goto1_rust.rl
+++ b/test/trans.d/case/goto1_rust.rl
diff --git a/test/cases/trans.d/case/gotocallret1.rl b/test/trans.d/case/gotocallret1.rl
index 91804725..91804725 100644
--- a/test/cases/trans.d/case/gotocallret1.rl
+++ b/test/trans.d/case/gotocallret1.rl
diff --git a/test/cases/trans.d/case/gotocallret1_asm.rl b/test/trans.d/case/gotocallret1_asm.rl
index f43b3760..f43b3760 100644
--- a/test/cases/trans.d/case/gotocallret1_asm.rl
+++ b/test/trans.d/case/gotocallret1_asm.rl
diff --git a/test/cases/trans.d/case/gotocallret1_c.rl b/test/trans.d/case/gotocallret1_c.rl
index 6759cc15..6759cc15 100644
--- a/test/cases/trans.d/case/gotocallret1_c.rl
+++ b/test/trans.d/case/gotocallret1_c.rl
diff --git a/test/cases/trans.d/case/gotocallret1_crack.rl b/test/trans.d/case/gotocallret1_crack.rl
index 1f1f1aa2..1f1f1aa2 100644
--- a/test/cases/trans.d/case/gotocallret1_crack.rl
+++ b/test/trans.d/case/gotocallret1_crack.rl
diff --git a/test/cases/trans.d/case/gotocallret1_cs.rl b/test/trans.d/case/gotocallret1_cs.rl
index 37a005e8..37a005e8 100644
--- a/test/cases/trans.d/case/gotocallret1_cs.rl
+++ b/test/trans.d/case/gotocallret1_cs.rl
diff --git a/test/cases/trans.d/case/gotocallret1_d.rl b/test/trans.d/case/gotocallret1_d.rl
index ba4f57e2..ba4f57e2 100644
--- a/test/cases/trans.d/case/gotocallret1_d.rl
+++ b/test/trans.d/case/gotocallret1_d.rl
diff --git a/test/cases/trans.d/case/gotocallret1_go.rl b/test/trans.d/case/gotocallret1_go.rl
index 5806cd76..5806cd76 100644
--- a/test/cases/trans.d/case/gotocallret1_go.rl
+++ b/test/trans.d/case/gotocallret1_go.rl
diff --git a/test/cases/trans.d/case/gotocallret1_java.rl b/test/trans.d/case/gotocallret1_java.rl
index 343ade95..343ade95 100644
--- a/test/cases/trans.d/case/gotocallret1_java.rl
+++ b/test/trans.d/case/gotocallret1_java.rl
diff --git a/test/cases/trans.d/case/gotocallret1_julia.rl b/test/trans.d/case/gotocallret1_julia.rl
index 3b7c980a..3b7c980a 100644
--- a/test/cases/trans.d/case/gotocallret1_julia.rl
+++ b/test/trans.d/case/gotocallret1_julia.rl
diff --git a/test/cases/trans.d/case/gotocallret1_rust.rl b/test/trans.d/case/gotocallret1_rust.rl
index 308d9eae..308d9eae 100644
--- a/test/cases/trans.d/case/gotocallret1_rust.rl
+++ b/test/trans.d/case/gotocallret1_rust.rl
diff --git a/test/cases/trans.d/case/gotocallret2.rl b/test/trans.d/case/gotocallret2.rl
index 31dd13d7..31dd13d7 100644
--- a/test/cases/trans.d/case/gotocallret2.rl
+++ b/test/trans.d/case/gotocallret2.rl
diff --git a/test/cases/trans.d/case/gotocallret2_asm.rl b/test/trans.d/case/gotocallret2_asm.rl
index 47253b18..47253b18 100644
--- a/test/cases/trans.d/case/gotocallret2_asm.rl
+++ b/test/trans.d/case/gotocallret2_asm.rl
diff --git a/test/cases/trans.d/case/gotocallret2_c.rl b/test/trans.d/case/gotocallret2_c.rl
index 26a54187..26a54187 100644
--- a/test/cases/trans.d/case/gotocallret2_c.rl
+++ b/test/trans.d/case/gotocallret2_c.rl
diff --git a/test/cases/trans.d/case/gotocallret2_crack.rl b/test/trans.d/case/gotocallret2_crack.rl
index 23e22f48..23e22f48 100644
--- a/test/cases/trans.d/case/gotocallret2_crack.rl
+++ b/test/trans.d/case/gotocallret2_crack.rl
diff --git a/test/cases/trans.d/case/gotocallret2_cs.rl b/test/trans.d/case/gotocallret2_cs.rl
index dc806d0a..dc806d0a 100644
--- a/test/cases/trans.d/case/gotocallret2_cs.rl
+++ b/test/trans.d/case/gotocallret2_cs.rl
diff --git a/test/cases/trans.d/case/gotocallret2_d.rl b/test/trans.d/case/gotocallret2_d.rl
index 1aa67996..1aa67996 100644
--- a/test/cases/trans.d/case/gotocallret2_d.rl
+++ b/test/trans.d/case/gotocallret2_d.rl
diff --git a/test/cases/trans.d/case/gotocallret2_go.rl b/test/trans.d/case/gotocallret2_go.rl
index 0a13ab3f..0a13ab3f 100644
--- a/test/cases/trans.d/case/gotocallret2_go.rl
+++ b/test/trans.d/case/gotocallret2_go.rl
diff --git a/test/cases/trans.d/case/gotocallret2_java.rl b/test/trans.d/case/gotocallret2_java.rl
index 3022924e..3022924e 100644
--- a/test/cases/trans.d/case/gotocallret2_java.rl
+++ b/test/trans.d/case/gotocallret2_java.rl
diff --git a/test/cases/trans.d/case/gotocallret2_julia.rl b/test/trans.d/case/gotocallret2_julia.rl
index 24907e11..24907e11 100644
--- a/test/cases/trans.d/case/gotocallret2_julia.rl
+++ b/test/trans.d/case/gotocallret2_julia.rl
diff --git a/test/cases/trans.d/case/gotocallret2_rust.rl b/test/trans.d/case/gotocallret2_rust.rl
index 4ff56f43..4ff56f43 100644
--- a/test/cases/trans.d/case/gotocallret2_rust.rl
+++ b/test/trans.d/case/gotocallret2_rust.rl
diff --git a/test/cases/trans.d/case/gotocallret3.rl b/test/trans.d/case/gotocallret3.rl
index d2c5e71a..d2c5e71a 100644
--- a/test/cases/trans.d/case/gotocallret3.rl
+++ b/test/trans.d/case/gotocallret3.rl
diff --git a/test/cases/trans.d/case/gotocallret3_asm.rl b/test/trans.d/case/gotocallret3_asm.rl
index 01a11cc0..01a11cc0 100644
--- a/test/cases/trans.d/case/gotocallret3_asm.rl
+++ b/test/trans.d/case/gotocallret3_asm.rl
diff --git a/test/cases/trans.d/case/gotocallret3_c.rl b/test/trans.d/case/gotocallret3_c.rl
index 13195f33..13195f33 100644
--- a/test/cases/trans.d/case/gotocallret3_c.rl
+++ b/test/trans.d/case/gotocallret3_c.rl
diff --git a/test/cases/trans.d/case/gotocallret3_crack.rl b/test/trans.d/case/gotocallret3_crack.rl
index 73164ef8..73164ef8 100644
--- a/test/cases/trans.d/case/gotocallret3_crack.rl
+++ b/test/trans.d/case/gotocallret3_crack.rl
diff --git a/test/cases/trans.d/case/gotocallret3_cs.rl b/test/trans.d/case/gotocallret3_cs.rl
index 4b5d34f1..4b5d34f1 100644
--- a/test/cases/trans.d/case/gotocallret3_cs.rl
+++ b/test/trans.d/case/gotocallret3_cs.rl
diff --git a/test/cases/trans.d/case/gotocallret3_d.rl b/test/trans.d/case/gotocallret3_d.rl
index eb95f265..eb95f265 100644
--- a/test/cases/trans.d/case/gotocallret3_d.rl
+++ b/test/trans.d/case/gotocallret3_d.rl
diff --git a/test/cases/trans.d/case/gotocallret3_go.rl b/test/trans.d/case/gotocallret3_go.rl
index 5c27bfc1..5c27bfc1 100644
--- a/test/cases/trans.d/case/gotocallret3_go.rl
+++ b/test/trans.d/case/gotocallret3_go.rl
diff --git a/test/cases/trans.d/case/gotocallret3_java.rl b/test/trans.d/case/gotocallret3_java.rl
index d27e33b8..d27e33b8 100644
--- a/test/cases/trans.d/case/gotocallret3_java.rl
+++ b/test/trans.d/case/gotocallret3_java.rl
diff --git a/test/cases/trans.d/case/gotocallret3_julia.rl b/test/trans.d/case/gotocallret3_julia.rl
index af78871b..af78871b 100644
--- a/test/cases/trans.d/case/gotocallret3_julia.rl
+++ b/test/trans.d/case/gotocallret3_julia.rl
diff --git a/test/cases/trans.d/case/gotocallret3_ocaml.rl b/test/trans.d/case/gotocallret3_ocaml.rl
index d4d243cc..d4d243cc 100644
--- a/test/cases/trans.d/case/gotocallret3_ocaml.rl
+++ b/test/trans.d/case/gotocallret3_ocaml.rl
diff --git a/test/cases/trans.d/case/gotocallret3_ruby.rl b/test/trans.d/case/gotocallret3_ruby.rl
index 78677d33..78677d33 100644
--- a/test/cases/trans.d/case/gotocallret3_ruby.rl
+++ b/test/trans.d/case/gotocallret3_ruby.rl
diff --git a/test/cases/trans.d/case/gotocallret3_rust.rl b/test/trans.d/case/gotocallret3_rust.rl
index 74982028..74982028 100644
--- a/test/cases/trans.d/case/gotocallret3_rust.rl
+++ b/test/trans.d/case/gotocallret3_rust.rl
diff --git a/test/cases/trans.d/case/ncall1.rl b/test/trans.d/case/ncall1.rl
index 9268ad31..9268ad31 100644
--- a/test/cases/trans.d/case/ncall1.rl
+++ b/test/trans.d/case/ncall1.rl
diff --git a/test/cases/trans.d/case/ncall1_asm.rl b/test/trans.d/case/ncall1_asm.rl
index e8b97808..e8b97808 100644
--- a/test/cases/trans.d/case/ncall1_asm.rl
+++ b/test/trans.d/case/ncall1_asm.rl
diff --git a/test/cases/trans.d/case/ncall1_c.rl b/test/trans.d/case/ncall1_c.rl
index 142781da..142781da 100644
--- a/test/cases/trans.d/case/ncall1_c.rl
+++ b/test/trans.d/case/ncall1_c.rl
diff --git a/test/cases/trans.d/case/ncall1_crack.rl b/test/trans.d/case/ncall1_crack.rl
index ee79a88a..ee79a88a 100644
--- a/test/cases/trans.d/case/ncall1_crack.rl
+++ b/test/trans.d/case/ncall1_crack.rl
diff --git a/test/cases/trans.d/case/ncall1_cs.rl b/test/trans.d/case/ncall1_cs.rl
index 91abd9bb..91abd9bb 100644
--- a/test/cases/trans.d/case/ncall1_cs.rl
+++ b/test/trans.d/case/ncall1_cs.rl
diff --git a/test/cases/trans.d/case/ncall1_d.rl b/test/trans.d/case/ncall1_d.rl
index 29ec074a..29ec074a 100644
--- a/test/cases/trans.d/case/ncall1_d.rl
+++ b/test/trans.d/case/ncall1_d.rl
diff --git a/test/cases/trans.d/case/ncall1_go.rl b/test/trans.d/case/ncall1_go.rl
index 565b5d33..565b5d33 100644
--- a/test/cases/trans.d/case/ncall1_go.rl
+++ b/test/trans.d/case/ncall1_go.rl
diff --git a/test/cases/trans.d/case/ncall1_java.rl b/test/trans.d/case/ncall1_java.rl
index 0576f26a..0576f26a 100644
--- a/test/cases/trans.d/case/ncall1_java.rl
+++ b/test/trans.d/case/ncall1_java.rl
diff --git a/test/cases/trans.d/case/ncall1_julia.rl b/test/trans.d/case/ncall1_julia.rl
index ec84a20b..ec84a20b 100644
--- a/test/cases/trans.d/case/ncall1_julia.rl
+++ b/test/trans.d/case/ncall1_julia.rl
diff --git a/test/cases/trans.d/case/ncall1_ocaml.rl b/test/trans.d/case/ncall1_ocaml.rl
index a1623c83..a1623c83 100644
--- a/test/cases/trans.d/case/ncall1_ocaml.rl
+++ b/test/trans.d/case/ncall1_ocaml.rl
diff --git a/test/cases/trans.d/case/ncall1_ruby.rl b/test/trans.d/case/ncall1_ruby.rl
index b24f7f10..b24f7f10 100644
--- a/test/cases/trans.d/case/ncall1_ruby.rl
+++ b/test/trans.d/case/ncall1_ruby.rl
diff --git a/test/cases/trans.d/case/ncall1_rust.rl b/test/trans.d/case/ncall1_rust.rl
index 77484cb4..77484cb4 100644
--- a/test/cases/trans.d/case/ncall1_rust.rl
+++ b/test/trans.d/case/ncall1_rust.rl
diff --git a/test/cases/trans.d/case/next1.rl b/test/trans.d/case/next1.rl
index 6b53f510..6b53f510 100644
--- a/test/cases/trans.d/case/next1.rl
+++ b/test/trans.d/case/next1.rl
diff --git a/test/cases/trans.d/case/next1_asm.rl b/test/trans.d/case/next1_asm.rl
index 3adf0962..3adf0962 100644
--- a/test/cases/trans.d/case/next1_asm.rl
+++ b/test/trans.d/case/next1_asm.rl
diff --git a/test/cases/trans.d/case/next1_c.rl b/test/trans.d/case/next1_c.rl
index ddfcfa9c..ddfcfa9c 100644
--- a/test/cases/trans.d/case/next1_c.rl
+++ b/test/trans.d/case/next1_c.rl
diff --git a/test/cases/trans.d/case/next1_crack.rl b/test/trans.d/case/next1_crack.rl
index e79755e9..e79755e9 100644
--- a/test/cases/trans.d/case/next1_crack.rl
+++ b/test/trans.d/case/next1_crack.rl
diff --git a/test/cases/trans.d/case/next1_cs.rl b/test/trans.d/case/next1_cs.rl
index 0d3719d0..0d3719d0 100644
--- a/test/cases/trans.d/case/next1_cs.rl
+++ b/test/trans.d/case/next1_cs.rl
diff --git a/test/cases/trans.d/case/next1_d.rl b/test/trans.d/case/next1_d.rl
index dda6b675..dda6b675 100644
--- a/test/cases/trans.d/case/next1_d.rl
+++ b/test/trans.d/case/next1_d.rl
diff --git a/test/cases/trans.d/case/next1_go.rl b/test/trans.d/case/next1_go.rl
index 030f8c20..030f8c20 100644
--- a/test/cases/trans.d/case/next1_go.rl
+++ b/test/trans.d/case/next1_go.rl
diff --git a/test/cases/trans.d/case/next1_java.rl b/test/trans.d/case/next1_java.rl
index 73c2c005..73c2c005 100644
--- a/test/cases/trans.d/case/next1_java.rl
+++ b/test/trans.d/case/next1_java.rl
diff --git a/test/cases/trans.d/case/next1_julia.rl b/test/trans.d/case/next1_julia.rl
index 6283255a..6283255a 100644
--- a/test/cases/trans.d/case/next1_julia.rl
+++ b/test/trans.d/case/next1_julia.rl
diff --git a/test/cases/trans.d/case/next1_ocaml.rl b/test/trans.d/case/next1_ocaml.rl
index 1e084a3f..1e084a3f 100644
--- a/test/cases/trans.d/case/next1_ocaml.rl
+++ b/test/trans.d/case/next1_ocaml.rl
diff --git a/test/cases/trans.d/case/next1_ruby.rl b/test/trans.d/case/next1_ruby.rl
index d9611282..d9611282 100644
--- a/test/cases/trans.d/case/next1_ruby.rl
+++ b/test/trans.d/case/next1_ruby.rl
diff --git a/test/cases/trans.d/case/next1_rust.rl b/test/trans.d/case/next1_rust.rl
index 85470cae..85470cae 100644
--- a/test/cases/trans.d/case/next1_rust.rl
+++ b/test/trans.d/case/next1_rust.rl
diff --git a/test/cases/trans.d/case/next2.rl b/test/trans.d/case/next2.rl
index 9f8ffe2a..9f8ffe2a 100644
--- a/test/cases/trans.d/case/next2.rl
+++ b/test/trans.d/case/next2.rl
diff --git a/test/cases/trans.d/case/next2_asm.rl b/test/trans.d/case/next2_asm.rl
index 471f9fe1..471f9fe1 100644
--- a/test/cases/trans.d/case/next2_asm.rl
+++ b/test/trans.d/case/next2_asm.rl
diff --git a/test/cases/trans.d/case/next2_c.rl b/test/trans.d/case/next2_c.rl
index 1251e563..1251e563 100644
--- a/test/cases/trans.d/case/next2_c.rl
+++ b/test/trans.d/case/next2_c.rl
diff --git a/test/cases/trans.d/case/next2_crack.rl b/test/trans.d/case/next2_crack.rl
index 9e90f50f..9e90f50f 100644
--- a/test/cases/trans.d/case/next2_crack.rl
+++ b/test/trans.d/case/next2_crack.rl
diff --git a/test/cases/trans.d/case/next2_cs.rl b/test/trans.d/case/next2_cs.rl
index d0cd61d3..d0cd61d3 100644
--- a/test/cases/trans.d/case/next2_cs.rl
+++ b/test/trans.d/case/next2_cs.rl
diff --git a/test/cases/trans.d/case/next2_d.rl b/test/trans.d/case/next2_d.rl
index 146fff5d..146fff5d 100644
--- a/test/cases/trans.d/case/next2_d.rl
+++ b/test/trans.d/case/next2_d.rl
diff --git a/test/cases/trans.d/case/next2_go.rl b/test/trans.d/case/next2_go.rl
index a019ebd4..a019ebd4 100644
--- a/test/cases/trans.d/case/next2_go.rl
+++ b/test/trans.d/case/next2_go.rl
diff --git a/test/cases/trans.d/case/next2_java.rl b/test/trans.d/case/next2_java.rl
index 3fb7a4f7..3fb7a4f7 100644
--- a/test/cases/trans.d/case/next2_java.rl
+++ b/test/trans.d/case/next2_java.rl
diff --git a/test/cases/trans.d/case/next2_julia.rl b/test/trans.d/case/next2_julia.rl
index 43ae242c..43ae242c 100644
--- a/test/cases/trans.d/case/next2_julia.rl
+++ b/test/trans.d/case/next2_julia.rl
diff --git a/test/cases/trans.d/case/next2_ocaml.rl b/test/trans.d/case/next2_ocaml.rl
index 6357296d..6357296d 100644
--- a/test/cases/trans.d/case/next2_ocaml.rl
+++ b/test/trans.d/case/next2_ocaml.rl
diff --git a/test/cases/trans.d/case/next2_ruby.rl b/test/trans.d/case/next2_ruby.rl
index 94b8ce98..94b8ce98 100644
--- a/test/cases/trans.d/case/next2_ruby.rl
+++ b/test/trans.d/case/next2_ruby.rl
diff --git a/test/cases/trans.d/case/next2_rust.rl b/test/trans.d/case/next2_rust.rl
index d712cf26..d712cf26 100644
--- a/test/cases/trans.d/case/next2_rust.rl
+++ b/test/trans.d/case/next2_rust.rl
diff --git a/test/cases/trans.d/case/patact.rl b/test/trans.d/case/patact.rl
index 1e16c63a..1e16c63a 100644
--- a/test/cases/trans.d/case/patact.rl
+++ b/test/trans.d/case/patact.rl
diff --git a/test/cases/trans.d/case/patact_asm.rl b/test/trans.d/case/patact_asm.rl
index 246cca71..246cca71 100644
--- a/test/cases/trans.d/case/patact_asm.rl
+++ b/test/trans.d/case/patact_asm.rl
diff --git a/test/cases/trans.d/case/patact_c.rl b/test/trans.d/case/patact_c.rl
index e3a7df35..e3a7df35 100644
--- a/test/cases/trans.d/case/patact_c.rl
+++ b/test/trans.d/case/patact_c.rl
diff --git a/test/cases/trans.d/case/patact_crack.rl b/test/trans.d/case/patact_crack.rl
index f4da2926..f4da2926 100644
--- a/test/cases/trans.d/case/patact_crack.rl
+++ b/test/trans.d/case/patact_crack.rl
diff --git a/test/cases/trans.d/case/patact_cs.rl b/test/trans.d/case/patact_cs.rl
index da82bac9..da82bac9 100644
--- a/test/cases/trans.d/case/patact_cs.rl
+++ b/test/trans.d/case/patact_cs.rl
diff --git a/test/cases/trans.d/case/patact_d.rl b/test/trans.d/case/patact_d.rl
index 94b65eb2..94b65eb2 100644
--- a/test/cases/trans.d/case/patact_d.rl
+++ b/test/trans.d/case/patact_d.rl
diff --git a/test/cases/trans.d/case/patact_go.rl b/test/trans.d/case/patact_go.rl
index 2ee97c36..2ee97c36 100644
--- a/test/cases/trans.d/case/patact_go.rl
+++ b/test/trans.d/case/patact_go.rl
diff --git a/test/cases/trans.d/case/patact_java.rl b/test/trans.d/case/patact_java.rl
index 7ff06d11..7ff06d11 100644
--- a/test/cases/trans.d/case/patact_java.rl
+++ b/test/trans.d/case/patact_java.rl
diff --git a/test/cases/trans.d/case/patact_julia.rl b/test/trans.d/case/patact_julia.rl
index a6f69ee9..a6f69ee9 100644
--- a/test/cases/trans.d/case/patact_julia.rl
+++ b/test/trans.d/case/patact_julia.rl
diff --git a/test/cases/trans.d/case/patact_ocaml.rl b/test/trans.d/case/patact_ocaml.rl
index 1775c8ce..1775c8ce 100644
--- a/test/cases/trans.d/case/patact_ocaml.rl
+++ b/test/trans.d/case/patact_ocaml.rl
diff --git a/test/cases/trans.d/case/patact_ruby.rl b/test/trans.d/case/patact_ruby.rl
index 43a535e6..43a535e6 100644
--- a/test/cases/trans.d/case/patact_ruby.rl
+++ b/test/trans.d/case/patact_ruby.rl
diff --git a/test/cases/trans.d/case/patact_rust.rl b/test/trans.d/case/patact_rust.rl
index 8f660e1f..8f660e1f 100644
--- a/test/cases/trans.d/case/patact_rust.rl
+++ b/test/trans.d/case/patact_rust.rl
diff --git a/test/cases/trans.d/case/rangei.rl b/test/trans.d/case/rangei.rl
index 1b523556..1b523556 100644
--- a/test/cases/trans.d/case/rangei.rl
+++ b/test/trans.d/case/rangei.rl
diff --git a/test/cases/trans.d/case/rangei_asm.rl b/test/trans.d/case/rangei_asm.rl
index 6906eb3b..6906eb3b 100644
--- a/test/cases/trans.d/case/rangei_asm.rl
+++ b/test/trans.d/case/rangei_asm.rl
diff --git a/test/cases/trans.d/case/rangei_c.rl b/test/trans.d/case/rangei_c.rl
index da69b0c2..da69b0c2 100644
--- a/test/cases/trans.d/case/rangei_c.rl
+++ b/test/trans.d/case/rangei_c.rl
diff --git a/test/cases/trans.d/case/rangei_crack.rl b/test/trans.d/case/rangei_crack.rl
index 7816b6cd..7816b6cd 100644
--- a/test/cases/trans.d/case/rangei_crack.rl
+++ b/test/trans.d/case/rangei_crack.rl
diff --git a/test/cases/trans.d/case/rangei_cs.rl b/test/trans.d/case/rangei_cs.rl
index 8b0dbe7e..8b0dbe7e 100644
--- a/test/cases/trans.d/case/rangei_cs.rl
+++ b/test/trans.d/case/rangei_cs.rl
diff --git a/test/cases/trans.d/case/rangei_d.rl b/test/trans.d/case/rangei_d.rl
index fde4987c..fde4987c 100644
--- a/test/cases/trans.d/case/rangei_d.rl
+++ b/test/trans.d/case/rangei_d.rl
diff --git a/test/cases/trans.d/case/rangei_go.rl b/test/trans.d/case/rangei_go.rl
index 2f17a6f2..2f17a6f2 100644
--- a/test/cases/trans.d/case/rangei_go.rl
+++ b/test/trans.d/case/rangei_go.rl
diff --git a/test/cases/trans.d/case/rangei_java.rl b/test/trans.d/case/rangei_java.rl
index e437f259..e437f259 100644
--- a/test/cases/trans.d/case/rangei_java.rl
+++ b/test/trans.d/case/rangei_java.rl
diff --git a/test/cases/trans.d/case/rangei_julia.rl b/test/trans.d/case/rangei_julia.rl
index 392950b3..392950b3 100644
--- a/test/cases/trans.d/case/rangei_julia.rl
+++ b/test/trans.d/case/rangei_julia.rl
diff --git a/test/cases/trans.d/case/rangei_ocaml.rl b/test/trans.d/case/rangei_ocaml.rl
index dbca2463..dbca2463 100644
--- a/test/cases/trans.d/case/rangei_ocaml.rl
+++ b/test/trans.d/case/rangei_ocaml.rl
diff --git a/test/cases/trans.d/case/rangei_ruby.rl b/test/trans.d/case/rangei_ruby.rl
index 19db2bd9..19db2bd9 100644
--- a/test/cases/trans.d/case/rangei_ruby.rl
+++ b/test/trans.d/case/rangei_ruby.rl
diff --git a/test/cases/trans.d/case/rangei_rust.rl b/test/trans.d/case/rangei_rust.rl
index 40ea2815..40ea2815 100644
--- a/test/cases/trans.d/case/rangei_rust.rl
+++ b/test/trans.d/case/rangei_rust.rl
diff --git a/test/cases/trans.d/case/scan1.rl b/test/trans.d/case/scan1.rl
index 2675b601..2675b601 100644
--- a/test/cases/trans.d/case/scan1.rl
+++ b/test/trans.d/case/scan1.rl
diff --git a/test/cases/trans.d/case/scan1_asm.rl b/test/trans.d/case/scan1_asm.rl
index 999b0c4a..999b0c4a 100644
--- a/test/cases/trans.d/case/scan1_asm.rl
+++ b/test/trans.d/case/scan1_asm.rl
diff --git a/test/cases/trans.d/case/scan1_c.rl b/test/trans.d/case/scan1_c.rl
index 5ecbf243..5ecbf243 100644
--- a/test/cases/trans.d/case/scan1_c.rl
+++ b/test/trans.d/case/scan1_c.rl
diff --git a/test/cases/trans.d/case/scan1_crack.rl b/test/trans.d/case/scan1_crack.rl
index c2d9de1a..c2d9de1a 100644
--- a/test/cases/trans.d/case/scan1_crack.rl
+++ b/test/trans.d/case/scan1_crack.rl
diff --git a/test/cases/trans.d/case/scan1_cs.rl b/test/trans.d/case/scan1_cs.rl
index 7f5a98f6..7f5a98f6 100644
--- a/test/cases/trans.d/case/scan1_cs.rl
+++ b/test/trans.d/case/scan1_cs.rl
diff --git a/test/cases/trans.d/case/scan1_d.rl b/test/trans.d/case/scan1_d.rl
index adbcb66d..adbcb66d 100644
--- a/test/cases/trans.d/case/scan1_d.rl
+++ b/test/trans.d/case/scan1_d.rl
diff --git a/test/cases/trans.d/case/scan1_go.rl b/test/trans.d/case/scan1_go.rl
index 66ca5f0c..66ca5f0c 100644
--- a/test/cases/trans.d/case/scan1_go.rl
+++ b/test/trans.d/case/scan1_go.rl
diff --git a/test/cases/trans.d/case/scan1_java.rl b/test/trans.d/case/scan1_java.rl
index 93562703..93562703 100644
--- a/test/cases/trans.d/case/scan1_java.rl
+++ b/test/trans.d/case/scan1_java.rl
diff --git a/test/cases/trans.d/case/scan1_julia.rl b/test/trans.d/case/scan1_julia.rl
index 537e22c3..537e22c3 100644
--- a/test/cases/trans.d/case/scan1_julia.rl
+++ b/test/trans.d/case/scan1_julia.rl
diff --git a/test/cases/trans.d/case/scan1_ocaml.rl b/test/trans.d/case/scan1_ocaml.rl
index d3a156e6..d3a156e6 100644
--- a/test/cases/trans.d/case/scan1_ocaml.rl
+++ b/test/trans.d/case/scan1_ocaml.rl
diff --git a/test/cases/trans.d/case/scan1_ruby.rl b/test/trans.d/case/scan1_ruby.rl
index 3c983fe5..3c983fe5 100644
--- a/test/cases/trans.d/case/scan1_ruby.rl
+++ b/test/trans.d/case/scan1_ruby.rl
diff --git a/test/cases/trans.d/case/scan1_rust.rl b/test/trans.d/case/scan1_rust.rl
index aa67bcd5..aa67bcd5 100644
--- a/test/cases/trans.d/case/scan1_rust.rl
+++ b/test/trans.d/case/scan1_rust.rl
diff --git a/test/cases/trans.d/case/scan2.rl b/test/trans.d/case/scan2.rl
index 167b2c8c..167b2c8c 100644
--- a/test/cases/trans.d/case/scan2.rl
+++ b/test/trans.d/case/scan2.rl
diff --git a/test/cases/trans.d/case/scan2_asm.rl b/test/trans.d/case/scan2_asm.rl
index 72500c64..72500c64 100644
--- a/test/cases/trans.d/case/scan2_asm.rl
+++ b/test/trans.d/case/scan2_asm.rl
diff --git a/test/cases/trans.d/case/scan2_c.rl b/test/trans.d/case/scan2_c.rl
index 61638e8f..61638e8f 100644
--- a/test/cases/trans.d/case/scan2_c.rl
+++ b/test/trans.d/case/scan2_c.rl
diff --git a/test/cases/trans.d/case/scan2_crack.rl b/test/trans.d/case/scan2_crack.rl
index dcc88144..dcc88144 100644
--- a/test/cases/trans.d/case/scan2_crack.rl
+++ b/test/trans.d/case/scan2_crack.rl
diff --git a/test/cases/trans.d/case/scan2_cs.rl b/test/trans.d/case/scan2_cs.rl
index b49e6ef2..b49e6ef2 100644
--- a/test/cases/trans.d/case/scan2_cs.rl
+++ b/test/trans.d/case/scan2_cs.rl
diff --git a/test/cases/trans.d/case/scan2_d.rl b/test/trans.d/case/scan2_d.rl
index 79a6eda5..79a6eda5 100644
--- a/test/cases/trans.d/case/scan2_d.rl
+++ b/test/trans.d/case/scan2_d.rl
diff --git a/test/cases/trans.d/case/scan2_go.rl b/test/trans.d/case/scan2_go.rl
index d52c4e39..d52c4e39 100644
--- a/test/cases/trans.d/case/scan2_go.rl
+++ b/test/trans.d/case/scan2_go.rl
diff --git a/test/cases/trans.d/case/scan2_java.rl b/test/trans.d/case/scan2_java.rl
index eb07ac70..eb07ac70 100644
--- a/test/cases/trans.d/case/scan2_java.rl
+++ b/test/trans.d/case/scan2_java.rl
diff --git a/test/cases/trans.d/case/scan2_julia.rl b/test/trans.d/case/scan2_julia.rl
index 2d0c095e..2d0c095e 100644
--- a/test/cases/trans.d/case/scan2_julia.rl
+++ b/test/trans.d/case/scan2_julia.rl
diff --git a/test/cases/trans.d/case/scan2_ocaml.rl b/test/trans.d/case/scan2_ocaml.rl
index c43e5547..c43e5547 100644
--- a/test/cases/trans.d/case/scan2_ocaml.rl
+++ b/test/trans.d/case/scan2_ocaml.rl
diff --git a/test/cases/trans.d/case/scan2_ruby.rl b/test/trans.d/case/scan2_ruby.rl
index ba082b3f..ba082b3f 100644
--- a/test/cases/trans.d/case/scan2_ruby.rl
+++ b/test/trans.d/case/scan2_ruby.rl
diff --git a/test/cases/trans.d/case/scan2_rust.rl b/test/trans.d/case/scan2_rust.rl
index c0ef13ae..c0ef13ae 100644
--- a/test/cases/trans.d/case/scan2_rust.rl
+++ b/test/trans.d/case/scan2_rust.rl
diff --git a/test/cases/trans.d/case/scan3.rl b/test/trans.d/case/scan3.rl
index 80ab4815..80ab4815 100644
--- a/test/cases/trans.d/case/scan3.rl
+++ b/test/trans.d/case/scan3.rl
diff --git a/test/cases/trans.d/case/scan3_asm.rl b/test/trans.d/case/scan3_asm.rl
index 0f95a1e3..0f95a1e3 100644
--- a/test/cases/trans.d/case/scan3_asm.rl
+++ b/test/trans.d/case/scan3_asm.rl
diff --git a/test/cases/trans.d/case/scan3_c.rl b/test/trans.d/case/scan3_c.rl
index ccd0fcea..ccd0fcea 100644
--- a/test/cases/trans.d/case/scan3_c.rl
+++ b/test/trans.d/case/scan3_c.rl
diff --git a/test/cases/trans.d/case/scan3_crack.rl b/test/trans.d/case/scan3_crack.rl
index 8fbc734e..8fbc734e 100644
--- a/test/cases/trans.d/case/scan3_crack.rl
+++ b/test/trans.d/case/scan3_crack.rl
diff --git a/test/cases/trans.d/case/scan3_cs.rl b/test/trans.d/case/scan3_cs.rl
index 0a802b65..0a802b65 100644
--- a/test/cases/trans.d/case/scan3_cs.rl
+++ b/test/trans.d/case/scan3_cs.rl
diff --git a/test/cases/trans.d/case/scan3_d.rl b/test/trans.d/case/scan3_d.rl
index 334d9291..334d9291 100644
--- a/test/cases/trans.d/case/scan3_d.rl
+++ b/test/trans.d/case/scan3_d.rl
diff --git a/test/cases/trans.d/case/scan3_go.rl b/test/trans.d/case/scan3_go.rl
index 4bc7363f..4bc7363f 100644
--- a/test/cases/trans.d/case/scan3_go.rl
+++ b/test/trans.d/case/scan3_go.rl
diff --git a/test/cases/trans.d/case/scan3_java.rl b/test/trans.d/case/scan3_java.rl
index b4caad5d..b4caad5d 100644
--- a/test/cases/trans.d/case/scan3_java.rl
+++ b/test/trans.d/case/scan3_java.rl
diff --git a/test/cases/trans.d/case/scan3_julia.rl b/test/trans.d/case/scan3_julia.rl
index c79e3c42..c79e3c42 100644
--- a/test/cases/trans.d/case/scan3_julia.rl
+++ b/test/trans.d/case/scan3_julia.rl
diff --git a/test/cases/trans.d/case/scan3_ocaml.rl b/test/trans.d/case/scan3_ocaml.rl
index fb783612..fb783612 100644
--- a/test/cases/trans.d/case/scan3_ocaml.rl
+++ b/test/trans.d/case/scan3_ocaml.rl
diff --git a/test/cases/trans.d/case/scan3_ruby.rl b/test/trans.d/case/scan3_ruby.rl
index dc104d8f..dc104d8f 100644
--- a/test/cases/trans.d/case/scan3_ruby.rl
+++ b/test/trans.d/case/scan3_ruby.rl
diff --git a/test/cases/trans.d/case/scan3_rust.rl b/test/trans.d/case/scan3_rust.rl
index f8644ad1..f8644ad1 100644
--- a/test/cases/trans.d/case/scan3_rust.rl
+++ b/test/trans.d/case/scan3_rust.rl
diff --git a/test/cases/trans.d/case/scan4.rl b/test/trans.d/case/scan4.rl
index 44f24b16..44f24b16 100644
--- a/test/cases/trans.d/case/scan4.rl
+++ b/test/trans.d/case/scan4.rl
diff --git a/test/cases/trans.d/case/scan4_asm.rl b/test/trans.d/case/scan4_asm.rl
index fe31624e..fe31624e 100644
--- a/test/cases/trans.d/case/scan4_asm.rl
+++ b/test/trans.d/case/scan4_asm.rl
diff --git a/test/cases/trans.d/case/scan4_c.rl b/test/trans.d/case/scan4_c.rl
index 16156454..16156454 100644
--- a/test/cases/trans.d/case/scan4_c.rl
+++ b/test/trans.d/case/scan4_c.rl
diff --git a/test/cases/trans.d/case/scan4_crack.rl b/test/trans.d/case/scan4_crack.rl
index 5b3df31a..5b3df31a 100644
--- a/test/cases/trans.d/case/scan4_crack.rl
+++ b/test/trans.d/case/scan4_crack.rl
diff --git a/test/cases/trans.d/case/scan4_cs.rl b/test/trans.d/case/scan4_cs.rl
index d0c4ad2c..d0c4ad2c 100644
--- a/test/cases/trans.d/case/scan4_cs.rl
+++ b/test/trans.d/case/scan4_cs.rl
diff --git a/test/cases/trans.d/case/scan4_d.rl b/test/trans.d/case/scan4_d.rl
index 4e942a3c..4e942a3c 100644
--- a/test/cases/trans.d/case/scan4_d.rl
+++ b/test/trans.d/case/scan4_d.rl
diff --git a/test/cases/trans.d/case/scan4_go.rl b/test/trans.d/case/scan4_go.rl
index bb7ee8bd..bb7ee8bd 100644
--- a/test/cases/trans.d/case/scan4_go.rl
+++ b/test/trans.d/case/scan4_go.rl
diff --git a/test/cases/trans.d/case/scan4_java.rl b/test/trans.d/case/scan4_java.rl
index 852676d9..852676d9 100644
--- a/test/cases/trans.d/case/scan4_java.rl
+++ b/test/trans.d/case/scan4_java.rl
diff --git a/test/cases/trans.d/case/scan4_julia.rl b/test/trans.d/case/scan4_julia.rl
index f23b5efa..f23b5efa 100644
--- a/test/cases/trans.d/case/scan4_julia.rl
+++ b/test/trans.d/case/scan4_julia.rl
diff --git a/test/cases/trans.d/case/scan4_ocaml.rl b/test/trans.d/case/scan4_ocaml.rl
index 21e13be8..21e13be8 100644
--- a/test/cases/trans.d/case/scan4_ocaml.rl
+++ b/test/trans.d/case/scan4_ocaml.rl
diff --git a/test/cases/trans.d/case/scan4_ruby.rl b/test/trans.d/case/scan4_ruby.rl
index 3fd484ce..3fd484ce 100644
--- a/test/cases/trans.d/case/scan4_ruby.rl
+++ b/test/trans.d/case/scan4_ruby.rl
diff --git a/test/cases/trans.d/case/scan4_rust.rl b/test/trans.d/case/scan4_rust.rl
index 84e03aea..84e03aea 100644
--- a/test/cases/trans.d/case/scan4_rust.rl
+++ b/test/trans.d/case/scan4_rust.rl
diff --git a/test/cases/trans.d/case/stateact1.rl b/test/trans.d/case/stateact1.rl
index e5878b7c..e5878b7c 100644
--- a/test/cases/trans.d/case/stateact1.rl
+++ b/test/trans.d/case/stateact1.rl
diff --git a/test/cases/trans.d/case/stateact1_asm.rl b/test/trans.d/case/stateact1_asm.rl
index 1d2f9486..1d2f9486 100644
--- a/test/cases/trans.d/case/stateact1_asm.rl
+++ b/test/trans.d/case/stateact1_asm.rl
diff --git a/test/cases/trans.d/case/stateact1_c.rl b/test/trans.d/case/stateact1_c.rl
index 3f6bc0fa..3f6bc0fa 100644
--- a/test/cases/trans.d/case/stateact1_c.rl
+++ b/test/trans.d/case/stateact1_c.rl
diff --git a/test/cases/trans.d/case/stateact1_crack.rl b/test/trans.d/case/stateact1_crack.rl
index 3bdb22aa..3bdb22aa 100644
--- a/test/cases/trans.d/case/stateact1_crack.rl
+++ b/test/trans.d/case/stateact1_crack.rl
diff --git a/test/cases/trans.d/case/stateact1_cs.rl b/test/trans.d/case/stateact1_cs.rl
index d2d37010..d2d37010 100644
--- a/test/cases/trans.d/case/stateact1_cs.rl
+++ b/test/trans.d/case/stateact1_cs.rl
diff --git a/test/cases/trans.d/case/stateact1_d.rl b/test/trans.d/case/stateact1_d.rl
index fb728430..fb728430 100644
--- a/test/cases/trans.d/case/stateact1_d.rl
+++ b/test/trans.d/case/stateact1_d.rl
diff --git a/test/cases/trans.d/case/stateact1_go.rl b/test/trans.d/case/stateact1_go.rl
index 3514bbc7..3514bbc7 100644
--- a/test/cases/trans.d/case/stateact1_go.rl
+++ b/test/trans.d/case/stateact1_go.rl
diff --git a/test/cases/trans.d/case/stateact1_java.rl b/test/trans.d/case/stateact1_java.rl
index 3b94ecf0..3b94ecf0 100644
--- a/test/cases/trans.d/case/stateact1_java.rl
+++ b/test/trans.d/case/stateact1_java.rl
diff --git a/test/cases/trans.d/case/stateact1_julia.rl b/test/trans.d/case/stateact1_julia.rl
index b750493d..b750493d 100644
--- a/test/cases/trans.d/case/stateact1_julia.rl
+++ b/test/trans.d/case/stateact1_julia.rl
diff --git a/test/cases/trans.d/case/stateact1_ocaml.rl b/test/trans.d/case/stateact1_ocaml.rl
index 86371297..86371297 100644
--- a/test/cases/trans.d/case/stateact1_ocaml.rl
+++ b/test/trans.d/case/stateact1_ocaml.rl
diff --git a/test/cases/trans.d/case/stateact1_ruby.rl b/test/trans.d/case/stateact1_ruby.rl
index d8ecb208..d8ecb208 100644
--- a/test/cases/trans.d/case/stateact1_ruby.rl
+++ b/test/trans.d/case/stateact1_ruby.rl
diff --git a/test/cases/trans.d/case/stateact1_rust.rl b/test/trans.d/case/stateact1_rust.rl
index f723f96a..f723f96a 100644
--- a/test/cases/trans.d/case/stateact1_rust.rl
+++ b/test/trans.d/case/stateact1_rust.rl
diff --git a/test/cases/trans.d/case/targs1.rl b/test/trans.d/case/targs1.rl
index b97a550e..b97a550e 100644
--- a/test/cases/trans.d/case/targs1.rl
+++ b/test/trans.d/case/targs1.rl
diff --git a/test/cases/trans.d/case/targs1_asm.rl b/test/trans.d/case/targs1_asm.rl
index 7d4df5f6..7d4df5f6 100644
--- a/test/cases/trans.d/case/targs1_asm.rl
+++ b/test/trans.d/case/targs1_asm.rl
diff --git a/test/cases/trans.d/case/targs1_c.rl b/test/trans.d/case/targs1_c.rl
index c0ae2539..c0ae2539 100644
--- a/test/cases/trans.d/case/targs1_c.rl
+++ b/test/trans.d/case/targs1_c.rl
diff --git a/test/cases/trans.d/case/targs1_crack.rl b/test/trans.d/case/targs1_crack.rl
index ebd0036a..ebd0036a 100644
--- a/test/cases/trans.d/case/targs1_crack.rl
+++ b/test/trans.d/case/targs1_crack.rl
diff --git a/test/cases/trans.d/case/targs1_cs.rl b/test/trans.d/case/targs1_cs.rl
index d655b7cd..d655b7cd 100644
--- a/test/cases/trans.d/case/targs1_cs.rl
+++ b/test/trans.d/case/targs1_cs.rl
diff --git a/test/cases/trans.d/case/targs1_d.rl b/test/trans.d/case/targs1_d.rl
index 82387206..82387206 100644
--- a/test/cases/trans.d/case/targs1_d.rl
+++ b/test/trans.d/case/targs1_d.rl
diff --git a/test/cases/trans.d/case/targs1_go.rl b/test/trans.d/case/targs1_go.rl
index 28d8de64..28d8de64 100644
--- a/test/cases/trans.d/case/targs1_go.rl
+++ b/test/trans.d/case/targs1_go.rl
diff --git a/test/cases/trans.d/case/targs1_java.rl b/test/trans.d/case/targs1_java.rl
index ddf2df9e..ddf2df9e 100644
--- a/test/cases/trans.d/case/targs1_java.rl
+++ b/test/trans.d/case/targs1_java.rl
diff --git a/test/cases/trans.d/case/targs1_julia.rl b/test/trans.d/case/targs1_julia.rl
index 445d407e..445d407e 100644
--- a/test/cases/trans.d/case/targs1_julia.rl
+++ b/test/trans.d/case/targs1_julia.rl
diff --git a/test/cases/trans.d/case/targs1_ocaml.rl b/test/trans.d/case/targs1_ocaml.rl
index 9fd43577..9fd43577 100644
--- a/test/cases/trans.d/case/targs1_ocaml.rl
+++ b/test/trans.d/case/targs1_ocaml.rl
diff --git a/test/cases/trans.d/case/targs1_ruby.rl b/test/trans.d/case/targs1_ruby.rl
index afb64592..afb64592 100644
--- a/test/cases/trans.d/case/targs1_ruby.rl
+++ b/test/trans.d/case/targs1_ruby.rl
diff --git a/test/cases/trans.d/case/targs1_rust.rl b/test/trans.d/case/targs1_rust.rl
index 6fc75120..6fc75120 100644
--- a/test/cases/trans.d/case/targs1_rust.rl
+++ b/test/trans.d/case/targs1_rust.rl
diff --git a/test/cases/trans.d/case/zlen1.rl b/test/trans.d/case/zlen1.rl
index 279818a0..279818a0 100644
--- a/test/cases/trans.d/case/zlen1.rl
+++ b/test/trans.d/case/zlen1.rl
diff --git a/test/cases/trans.d/case/zlen1_asm.rl b/test/trans.d/case/zlen1_asm.rl
index a0e6e010..a0e6e010 100644
--- a/test/cases/trans.d/case/zlen1_asm.rl
+++ b/test/trans.d/case/zlen1_asm.rl
diff --git a/test/cases/trans.d/case/zlen1_c.rl b/test/trans.d/case/zlen1_c.rl
index fbeda2a0..fbeda2a0 100644
--- a/test/cases/trans.d/case/zlen1_c.rl
+++ b/test/trans.d/case/zlen1_c.rl
diff --git a/test/cases/trans.d/case/zlen1_crack.rl b/test/trans.d/case/zlen1_crack.rl
index c4bfc983..c4bfc983 100644
--- a/test/cases/trans.d/case/zlen1_crack.rl
+++ b/test/trans.d/case/zlen1_crack.rl
diff --git a/test/cases/trans.d/case/zlen1_cs.rl b/test/trans.d/case/zlen1_cs.rl
index fd5e7835..fd5e7835 100644
--- a/test/cases/trans.d/case/zlen1_cs.rl
+++ b/test/trans.d/case/zlen1_cs.rl
diff --git a/test/cases/trans.d/case/zlen1_d.rl b/test/trans.d/case/zlen1_d.rl
index 61f43b11..61f43b11 100644
--- a/test/cases/trans.d/case/zlen1_d.rl
+++ b/test/trans.d/case/zlen1_d.rl
diff --git a/test/cases/trans.d/case/zlen1_go.rl b/test/trans.d/case/zlen1_go.rl
index 5c0446c8..5c0446c8 100644
--- a/test/cases/trans.d/case/zlen1_go.rl
+++ b/test/trans.d/case/zlen1_go.rl
diff --git a/test/cases/trans.d/case/zlen1_java.rl b/test/trans.d/case/zlen1_java.rl
index 71c483b6..71c483b6 100644
--- a/test/cases/trans.d/case/zlen1_java.rl
+++ b/test/trans.d/case/zlen1_java.rl
diff --git a/test/cases/trans.d/case/zlen1_julia.rl b/test/trans.d/case/zlen1_julia.rl
index c216470d..c216470d 100644
--- a/test/cases/trans.d/case/zlen1_julia.rl
+++ b/test/trans.d/case/zlen1_julia.rl
diff --git a/test/cases/trans.d/case/zlen1_ocaml.rl b/test/trans.d/case/zlen1_ocaml.rl
index 814d8657..814d8657 100644
--- a/test/cases/trans.d/case/zlen1_ocaml.rl
+++ b/test/trans.d/case/zlen1_ocaml.rl
diff --git a/test/cases/trans.d/case/zlen1_ruby.rl b/test/trans.d/case/zlen1_ruby.rl
index 8f3d75ad..8f3d75ad 100644
--- a/test/cases/trans.d/case/zlen1_ruby.rl
+++ b/test/trans.d/case/zlen1_ruby.rl
diff --git a/test/cases/trans.d/case/zlen1_rust.rl b/test/trans.d/case/zlen1_rust.rl
index b47751ca..b47751ca 100644
--- a/test/cases/trans.d/case/zlen1_rust.rl
+++ b/test/trans.d/case/zlen1_rust.rl
diff --git a/test/cases/trans.d/gentests b/test/trans.d/gentests
index 130c4b23..130c4b23 100755
--- a/test/cases/trans.d/gentests
+++ b/test/trans.d/gentests
diff --git a/test/cases/trans.d/main.c b/test/trans.d/main.c
index 7d3b0824..7d3b0824 100644
--- a/test/cases/trans.d/main.c
+++ b/test/trans.d/main.c
diff --git a/test/cases/trans.d/ragel-c.lm b/test/trans.d/ragel-c.lm
index ccc2dc93..ccc2dc93 100644
--- a/test/cases/trans.d/ragel-c.lm
+++ b/test/trans.d/ragel-c.lm
diff --git a/test/cases/trans.d/ragel-crack.lm b/test/trans.d/ragel-crack.lm
index b6480012..b6480012 100644
--- a/test/cases/trans.d/ragel-crack.lm
+++ b/test/trans.d/ragel-crack.lm
diff --git a/test/cases/trans.d/ragel-ocaml.lm b/test/trans.d/ragel-ocaml.lm
index 2b89535b..2b89535b 100644
--- a/test/cases/trans.d/ragel-ocaml.lm
+++ b/test/trans.d/ragel-ocaml.lm
diff --git a/test/cases/trans.d/ragel-ruby.lm b/test/trans.d/ragel-ruby.lm
index 29e36887..29e36887 100644
--- a/test/cases/trans.d/ragel-ruby.lm
+++ b/test/trans.d/ragel-ruby.lm
diff --git a/test/cases/trans.d/ragel.lm b/test/trans.d/ragel.lm
index 64d5bb6a..64d5bb6a 100644
--- a/test/cases/trans.d/ragel.lm
+++ b/test/trans.d/ragel.lm
diff --git a/test/cases/trans.d/trans-asm.lm b/test/trans.d/trans-asm.lm
index 1adcb6af..1adcb6af 100644
--- a/test/cases/trans.d/trans-asm.lm
+++ b/test/trans.d/trans-asm.lm
diff --git a/test/cases/trans.d/trans-c.lm b/test/trans.d/trans-c.lm
index 563e1eec..563e1eec 100644
--- a/test/cases/trans.d/trans-c.lm
+++ b/test/trans.d/trans-c.lm
diff --git a/test/cases/trans.d/trans-crack.lm b/test/trans.d/trans-crack.lm
index f9506cb6..f9506cb6 100644
--- a/test/cases/trans.d/trans-crack.lm
+++ b/test/trans.d/trans-crack.lm
diff --git a/test/cases/trans.d/trans-csharp.lm b/test/trans.d/trans-csharp.lm
index 5cd31085..5cd31085 100644
--- a/test/cases/trans.d/trans-csharp.lm
+++ b/test/trans.d/trans-csharp.lm
diff --git a/test/cases/trans.d/trans-d.lm b/test/trans.d/trans-d.lm
index 674b0555..674b0555 100644
--- a/test/cases/trans.d/trans-d.lm
+++ b/test/trans.d/trans-d.lm
diff --git a/test/cases/trans.d/trans-go.lm b/test/trans.d/trans-go.lm
index 30a5600f..30a5600f 100644
--- a/test/cases/trans.d/trans-go.lm
+++ b/test/trans.d/trans-go.lm
diff --git a/test/cases/trans.d/trans-java.lm b/test/trans.d/trans-java.lm
index 99c1b486..99c1b486 100644
--- a/test/cases/trans.d/trans-java.lm
+++ b/test/trans.d/trans-java.lm
diff --git a/test/cases/trans.d/trans-julia.lm b/test/trans.d/trans-julia.lm
index ed918dbb..ed918dbb 100644
--- a/test/cases/trans.d/trans-julia.lm
+++ b/test/trans.d/trans-julia.lm
diff --git a/test/cases/trans.d/trans-ocaml.lm b/test/trans.d/trans-ocaml.lm
index 4298637f..4298637f 100644
--- a/test/cases/trans.d/trans-ocaml.lm
+++ b/test/trans.d/trans-ocaml.lm
diff --git a/test/cases/trans.d/trans-ruby.lm b/test/trans.d/trans-ruby.lm
index df0f346c..df0f346c 100644
--- a/test/cases/trans.d/trans-ruby.lm
+++ b/test/trans.d/trans-ruby.lm
diff --git a/test/cases/trans.d/trans-rust.lm b/test/trans.d/trans-rust.lm
index b75f672b..b75f672b 100644
--- a/test/cases/trans.d/trans-rust.lm
+++ b/test/trans.d/trans-rust.lm
diff --git a/test/cases/trans.d/trans.lm b/test/trans.d/trans.lm
index b9fa5870..b9fa5870 100644
--- a/test/cases/trans.d/trans.lm
+++ b/test/trans.d/trans.lm