Index: tests/.expect/KRfunctions.arm64.txt
===================================================================
--- tests/.expect/KRfunctions.arm64.txt	(revision 718601e180b4bc52849b853fe3f82c00ceb387e5)
+++ tests/.expect/KRfunctions.arm64.txt	(revision eae8b37d7379001bb81375459612907897447955)
@@ -104,6 +104,6 @@
     signed int _X1bi_2;
     {
-        signed int *(*_tmp_cp_ret0)(signed int __param_0, signed int __param_1);
-        ((void)(_X1xFPi_ii__2=(((void)(_tmp_cp_ret0=_X3f10FFPi_ii__iPiPid__1(3, (&_X1ai_2), (&_X1bi_2), 3.5))) , _tmp_cp_ret0)));
+        signed int *(*_tmp_cp_ret8)(signed int __param_0, signed int __param_1);
+        ((void)(_X1xFPi_ii__2=(((void)(_tmp_cp_ret8=_X3f10FFPi_ii__iPiPid__1(3, (&_X1ai_2), (&_X1bi_2), 3.5))) , _tmp_cp_ret8)));
     }
 
Index: tests/.expect/KRfunctions.x64.txt
===================================================================
--- tests/.expect/KRfunctions.x64.txt	(revision 718601e180b4bc52849b853fe3f82c00ceb387e5)
+++ tests/.expect/KRfunctions.x64.txt	(revision eae8b37d7379001bb81375459612907897447955)
@@ -104,6 +104,6 @@
     signed int _X1bi_2;
     {
-        signed int *(*_tmp_cp_ret0)(signed int __param_0, signed int __param_1);
-        ((void)(_X1xFPi_ii__2=(((void)(_tmp_cp_ret0=_X3f10FFPi_ii__iPiPid__1(3, (&_X1ai_2), (&_X1bi_2), 3.5))) , _tmp_cp_ret0)));
+        signed int *(*_tmp_cp_ret8)(signed int __param_0, signed int __param_1);
+        ((void)(_X1xFPi_ii__2=(((void)(_tmp_cp_ret8=_X3f10FFPi_ii__iPiPid__1(3, (&_X1ai_2), (&_X1bi_2), 3.5))) , _tmp_cp_ret8)));
     }
 
Index: tests/.expect/declarationSpecifier.arm64.txt
===================================================================
--- tests/.expect/declarationSpecifier.arm64.txt	(revision 718601e180b4bc52849b853fe3f82c00ceb387e5)
+++ tests/.expect/declarationSpecifier.arm64.txt	(revision eae8b37d7379001bb81375459612907897447955)
@@ -1059,6 +1059,6 @@
     }
 
-    signed int _tmp_cp_ret0;
-    signed int _X3reti_2 = (((void)(_tmp_cp_ret0=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret0);
+    signed int _tmp_cp_ret8;
+    signed int _X3reti_2 = (((void)(_tmp_cp_ret8=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret8);
     if ( ((&_X17cfa_main_returnedi_1)!=((signed int *)0)) ) {
         {
Index: tests/.expect/declarationSpecifier.x64.txt
===================================================================
--- tests/.expect/declarationSpecifier.x64.txt	(revision 718601e180b4bc52849b853fe3f82c00ceb387e5)
+++ tests/.expect/declarationSpecifier.x64.txt	(revision eae8b37d7379001bb81375459612907897447955)
@@ -1059,6 +1059,6 @@
     }
 
-    signed int _tmp_cp_ret0;
-    signed int _X3reti_2 = (((void)(_tmp_cp_ret0=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret0);
+    signed int _tmp_cp_ret8;
+    signed int _X3reti_2 = (((void)(_tmp_cp_ret8=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret8);
     if ( ((&_X17cfa_main_returnedi_1)!=((signed int *)0)) ) {
         {
Index: tests/.expect/declarationSpecifier.x86.txt
===================================================================
--- tests/.expect/declarationSpecifier.x86.txt	(revision 718601e180b4bc52849b853fe3f82c00ceb387e5)
+++ tests/.expect/declarationSpecifier.x86.txt	(revision eae8b37d7379001bb81375459612907897447955)
@@ -1059,6 +1059,6 @@
     }
 
-    signed int _tmp_cp_ret0;
-    signed int _X3reti_2 = (((void)(_tmp_cp_ret0=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret0);
+    signed int _tmp_cp_ret8;
+    signed int _X3reti_2 = (((void)(_tmp_cp_ret8=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret8);
     if ( ((&_X17cfa_main_returnedi_1)!=((signed int *)0)) ) {
         {
Index: tests/.expect/extension.x64.txt
===================================================================
--- tests/.expect/extension.x64.txt	(revision 718601e180b4bc52849b853fe3f82c00ceb387e5)
+++ tests/.expect/extension.x64.txt	(revision eae8b37d7379001bb81375459612907897447955)
@@ -457,6 +457,6 @@
 
     {
-        signed int _tmp_cp_ret0;
-        ((void)(((void)(_tmp_cp_ret0=__extension__ _X4fredFi_i__1(3))) , _tmp_cp_ret0));
+        signed int _tmp_cp_ret8;
+        ((void)(((void)(_tmp_cp_ret8=__extension__ _X4fredFi_i__1(3))) , _tmp_cp_ret8));
     }
 
Index: tests/.expect/extension.x86.txt
===================================================================
--- tests/.expect/extension.x86.txt	(revision 718601e180b4bc52849b853fe3f82c00ceb387e5)
+++ tests/.expect/extension.x86.txt	(revision eae8b37d7379001bb81375459612907897447955)
@@ -457,6 +457,6 @@
 
     {
-        signed int _tmp_cp_ret0;
-        ((void)(((void)(_tmp_cp_ret0=__extension__ _X4fredFi_i__1(3))) , _tmp_cp_ret0));
+        signed int _tmp_cp_ret8;
+        ((void)(((void)(_tmp_cp_ret8=__extension__ _X4fredFi_i__1(3))) , _tmp_cp_ret8));
     }
 
Index: tests/.expect/gccExtensions.arm64.txt
===================================================================
--- tests/.expect/gccExtensions.arm64.txt	(revision 718601e180b4bc52849b853fe3f82c00ceb387e5)
+++ tests/.expect/gccExtensions.arm64.txt	(revision eae8b37d7379001bb81375459612907897447955)
@@ -339,6 +339,6 @@
     }
 
-    signed int _tmp_cp_ret0;
-    signed int _X3reti_2 = (((void)(_tmp_cp_ret0=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret0);
+    signed int _tmp_cp_ret8;
+    signed int _X3reti_2 = (((void)(_tmp_cp_ret8=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret8);
     if ( ((&_X17cfa_main_returnedi_1)!=((signed int *)0)) ) {
         {
Index: tests/.expect/gccExtensions.x64.txt
===================================================================
--- tests/.expect/gccExtensions.x64.txt	(revision 718601e180b4bc52849b853fe3f82c00ceb387e5)
+++ tests/.expect/gccExtensions.x64.txt	(revision eae8b37d7379001bb81375459612907897447955)
@@ -339,6 +339,6 @@
     }
 
-    signed int _tmp_cp_ret0;
-    signed int _X3reti_2 = (((void)(_tmp_cp_ret0=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret0);
+    signed int _tmp_cp_ret8;
+    signed int _X3reti_2 = (((void)(_tmp_cp_ret8=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret8);
     if ( ((&_X17cfa_main_returnedi_1)!=((signed int *)0)) ) {
         {
Index: tests/ctrl-flow/loopctrl.cfa
===================================================================
--- tests/ctrl-flow/loopctrl.cfa	(revision 718601e180b4bc52849b853fe3f82c00ceb387e5)
+++ tests/ctrl-flow/loopctrl.cfa	(revision eae8b37d7379001bb81375459612907897447955)
@@ -15,5 +15,4 @@
 
 #include <fstream.hfa>
-#include <enum.hfa>
 
 void fred() {
Index: tests/enum_tests/.expect/position.txt
===================================================================
--- tests/enum_tests/.expect/position.txt	(revision 718601e180b4bc52849b853fe3f82c00ceb387e5)
+++ tests/enum_tests/.expect/position.txt	(revision eae8b37d7379001bb81375459612907897447955)
@@ -1,5 +1,5 @@
-Compile Time: blue value: blue, position: 2, label: Blue, default return value: blue
-Runtime: fishy value: green, position: 1, label: Green, default return value: green
-Runtime: C2 value: green, position: 1, label: Green, default return value: green
+Enumeration Constant<Blue>:: value: blue, position: 2, label: Blue, default output: Blue
+Runtime Value<fishy>:: value: green, position: 1, label: Green, default output: Green
+Runtime Value<C2>:: value: green, position: 1, label: Green, default output: Green
 ao is red
 ko is green
Index: tests/enum_tests/anonymous.cfa
===================================================================
--- tests/enum_tests/anonymous.cfa	(revision 718601e180b4bc52849b853fe3f82c00ceb387e5)
+++ tests/enum_tests/anonymous.cfa	(revision eae8b37d7379001bb81375459612907897447955)
@@ -3,5 +3,5 @@
 
 int main() {
-    sout | nthreads;
+    sout | value(nthreads);
 }
 
Index: tests/enum_tests/enumInlineValue.cfa
===================================================================
--- tests/enum_tests/enumInlineValue.cfa	(revision 718601e180b4bc52849b853fe3f82c00ceb387e5)
+++ tests/enum_tests/enumInlineValue.cfa	(revision eae8b37d7379001bb81375459612907897447955)
@@ -1,4 +1,3 @@
 #include <fstream.hfa>
-#include <enum.hfa>
 
 enum(int) A !{
Index: tests/enum_tests/input.cfa
===================================================================
--- tests/enum_tests/input.cfa	(revision 718601e180b4bc52849b853fe3f82c00ceb387e5)
+++ tests/enum_tests/input.cfa	(revision eae8b37d7379001bb81375459612907897447955)
@@ -1,4 +1,3 @@
 #include <fstream.hfa>
-#include <enum.hfa>
 
 int main() {
Index: tests/enum_tests/planet.cfa
===================================================================
--- tests/enum_tests/planet.cfa	(revision 718601e180b4bc52849b853fe3f82c00ceb387e5)
+++ tests/enum_tests/planet.cfa	(revision eae8b37d7379001bb81375459612907897447955)
@@ -1,5 +1,4 @@
 #include <fstream.hfa>
 #include <stdlib.hfa>
-#include <enum.hfa>
 
 struct MR { double mass, radius; };
Index: tests/enum_tests/position.cfa
===================================================================
--- tests/enum_tests/position.cfa	(revision 718601e180b4bc52849b853fe3f82c00ceb387e5)
+++ tests/enum_tests/position.cfa	(revision eae8b37d7379001bb81375459612907897447955)
@@ -17,7 +17,7 @@
     Colour c2 = fishy;
 
-    sout | "Compile Time: blue value: " | value(Colour.Blue) | ", position: " | posn(Colour.Blue) | ", label: " | label(Colour.Blue) | ", default return value: " | Colour.Blue;
-    sout | "Runtime: fishy value: " | value(fishy) | ", position: " | posn(fishy) | ", label: " | label(fishy) | ", default return value: " | fishy;
-    sout | "Runtime: C2 value: " | value(c2) | ", position: " | posn(c2) | ", label: " | label(c2) | ", default return value: " | c2;
+    sout | "Enumeration Constant<Blue>:: value: " | value(Colour.Blue) | ", position: " | posn(Colour.Blue) | ", label: " | label(Colour.Blue) | ", default output: " | Colour.Blue;
+    sout | "Runtime Value<fishy>:: value: " | value(fishy) | ", position: " | posn(fishy) | ", label: " | label(fishy) | ", default output: " | fishy;
+    sout | "Runtime Value<C2>:: value: " | value(c2) | ", position: " | posn(c2) | ", label: " | label(c2) | ", default output: " | c2;
     Colour.Red;
     char * ao = Colour.Red;
Index: tests/enum_tests/typedIntEnum.cfa
===================================================================
--- tests/enum_tests/typedIntEnum.cfa	(revision 718601e180b4bc52849b853fe3f82c00ceb387e5)
+++ tests/enum_tests/typedIntEnum.cfa	(revision eae8b37d7379001bb81375459612907897447955)
@@ -12,11 +12,11 @@
 
 int main() {
-    sout | "0=" | zero;
-    sout | "1=" | one;
-    sout | "1000=" | thousand;
-    sout | "1001=" | thousand_one;
-    sout | "2000=" | two_thousand;
-    sout | "2001=" | two_thousand_one;
-    sout | "2002=" | two_thousand_two;
+    sout | "0=" | value(zero);
+    sout | "1=" | value(one);
+    sout | "1000=" | value(thousand);
+    sout | "1001=" | value(thousand_one);
+    sout | "2000=" | value(two_thousand);
+    sout | "2001=" | value(two_thousand_one);
+    sout | "2002=" | value(two_thousand_two);
     return 0;
 }
Index: tests/enum_tests/voidEnum.cfa
===================================================================
--- tests/enum_tests/voidEnum.cfa	(revision 718601e180b4bc52849b853fe3f82c00ceb387e5)
+++ tests/enum_tests/voidEnum.cfa	(revision eae8b37d7379001bb81375459612907897447955)
@@ -1,4 +1,3 @@
 #include <fstream.hfa>
-#include <enum.hfa>
 
 enum() E { A, B, C };