Index: tests/.expect/castError.txt
===================================================================
--- tests/.expect/castError.txt	(revision 06ecda91dcaa23679d25ab3ec5b928ff4db605a9)
+++ tests/.expect/castError.txt	(revision bcb41f782c406fd7a2d86d17b78156f3da5fab97)
@@ -6,5 +6,5 @@
 ... with resolved type:
   char Alternatives are:
-Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
+Cost ( 1, 0, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
       Variable Expression: f: double
       ... with resolved type:
@@ -19,5 +19,5 @@
   Environment:
 
-Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
+Cost ( 1, 0, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
       Variable Expression: f: function
         accepting unspecified arguments
@@ -38,5 +38,5 @@
   Environment:
 
-Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
+Cost ( 1, 0, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
       Variable Expression: f: signed int
       ... with resolved type:
@@ -62,5 +62,5 @@
 ... with resolved type:
   void Alternatives are:
-Cost ( 0, 0, 2, 0, 0, 0, 0 ): Generated Cast of:
+Cost ( 0, 0, 0, 2, 0, 0, 0, 0 ): Generated Cast of:
       Comma Expression:
         Constant Expression (3: signed int)
@@ -80,5 +80,5 @@
   Environment:
 
-Cost ( 0, 0, 2, 0, 0, 0, 0 ): Generated Cast of:
+Cost ( 0, 0, 0, 2, 0, 0, 0, 0 ): Generated Cast of:
       Comma Expression:
         Constant Expression (3: signed int)
Index: tests/errors/.expect/completeType.x64.txt
===================================================================
--- tests/errors/.expect/completeType.x64.txt	(revision 06ecda91dcaa23679d25ab3ec5b928ff4db605a9)
+++ tests/errors/.expect/completeType.x64.txt	(revision bcb41f782c406fd7a2d86d17b78156f3da5fab97)
@@ -9,5 +9,5 @@
 ... with resolved type:
   void Alternatives are:
-Cost ( 0, 1, 2, 0, 1, -1, 0 ): Generated Cast of:
+Cost ( 0, 0, 1, 2, 0, 1, -1, 0 ): Generated Cast of:
       Application of
         Variable Expression: *?: forall
@@ -44,5 +44,5 @@
 
 
-Cost ( 0, 1, 2, 0, 1, -1, 0 ): Generated Cast of:
+Cost ( 0, 0, 1, 2, 0, 1, -1, 0 ): Generated Cast of:
       Application of
         Variable Expression: *?: forall
@@ -111,5 +111,5 @@
 
       Unsatisfiable alternative:
-Cost ( 0, 1, 0, 0, 1, -5, 0 ): Application of
+Cost ( 0, 0, 1, 0, 0, 1, -5, 0 ): Application of
             Variable Expression: baz: forall
               instance of type T (not function type)
Index: tests/meta/.expect/arch.x64.txt
===================================================================
--- tests/meta/.expect/arch.x64.txt	(revision 06ecda91dcaa23679d25ab3ec5b928ff4db605a9)
+++ tests/meta/.expect/arch.x64.txt	(revision bcb41f782c406fd7a2d86d17b78156f3da5fab97)
@@ -6,5 +6,5 @@
 ... with resolved type:
   char Alternatives are:
-Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
+Cost ( 1, 0, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
       Variable Expression: FX64: double
       ... with resolved type:
@@ -19,5 +19,5 @@
   Environment:
 
-Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
+Cost ( 1, 0, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
       Variable Expression: FX64: function
         accepting unspecified arguments
@@ -38,5 +38,5 @@
   Environment:
 
-Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
+Cost ( 1, 0, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
       Variable Expression: FX64: signed int
       ... with resolved type: