Index: tests/.expect/castError.txt
===================================================================
--- tests/.expect/castError.txt	(revision f8de4e40d5bcd47b9d45d33c9ece4dfaf5a9329e)
+++ tests/.expect/castError.txt	(revision b9afb1e033ae2616e2bbbabe865fb7932d0434dc)
@@ -1,8 +1,8 @@
-castError.cfa:7:1 error: Cannot choose between 3 alternatives for expression
-Cast of:
+castError.cfa:21:1 error: Cannot choose between 3 alternatives for expression
+Explicit Cast of:
   Name: f
 ... to:
   char Alternatives are:
-Cost ( 1, 0, 0, 0, 0, 0, 0 ): Cast of:
+Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
      Variable Expression: f: function
        accepting unspecified arguments
@@ -16,5 +16,5 @@
  Environment:
 
-Cost ( 1, 0, 0, 0, 0, 0, 0 ): Cast of:
+Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
      Variable Expression: f: double
    ... to:
@@ -25,5 +25,5 @@
  Environment:
 
-Cost ( 1, 0, 0, 0, 0, 0, 0 ): Cast of:
+Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
      Variable Expression: f: signed int
    ... to:
@@ -35,2 +35,29 @@
 
 
+castError.cfa:26:1 error: Cannot choose between 2 alternatives for expression
+Generated Cast of:
+  Comma Expression:
+    constant expression (3 3: signed int)
+    Name: v
+... to: nothing Alternatives are:
+Cost ( 0, 0, 2, 0, 0, 0, 0 ): Generated Cast of:
+     Comma Expression:
+       constant expression (3 3: signed int)
+       Variable Expression: v: unsigned char
+   ... to: nothing
+ (types:
+   void 
+ )
+ Environment:
+
+Cost ( 0, 0, 2, 0, 0, 0, 0 ): Generated Cast of:
+     Comma Expression:
+       constant expression (3 3: signed int)
+       Variable Expression: v: signed short int
+   ... to: nothing
+ (types:
+   void 
+ )
+ Environment:
+
+
Index: tests/raii/.expect/ctor-autogen-ERR1.txt
===================================================================
--- tests/raii/.expect/ctor-autogen-ERR1.txt	(revision f8de4e40d5bcd47b9d45d33c9ece4dfaf5a9329e)
+++ tests/raii/.expect/ctor-autogen-ERR1.txt	(revision b9afb1e033ae2616e2bbbabe865fb7932d0434dc)
@@ -1,3 +1,3 @@
-raii/ctor-autogen.cfa:102:1 error: Unique best alternative includes deleted identifier in Cast of:
+raii/ctor-autogen.cfa:102:1 error: Unique best alternative includes deleted identifier in Generated Cast of:
   Application of
     Deleted Expression
@@ -27,9 +27,9 @@
 
             ... to arguments
-              Cast of:
+              Generated Cast of:
                 Member Expression, with field:
                   x: signed int
                 ... from aggregate:
-                  Cast of:
+                  Generated Cast of:
                     Variable Expression: m: reference to instance of struct Managed with body 1
                   ... to:
@@ -37,5 +37,5 @@
               ... to:
                 reference to signed int
-              Cast of:
+              Generated Cast of:
                 constant expression (0 0: zero_t)
               ... to:
@@ -48,5 +48,5 @@
 
   ... to arguments
-    Cast of:
+    Generated Cast of:
       Variable Expression: x: instance of struct Managed with body 1
     ... to:
Index: tests/warnings/.expect/self-assignment.txt
===================================================================
--- tests/warnings/.expect/self-assignment.txt	(revision f8de4e40d5bcd47b9d45d33c9ece4dfaf5a9329e)
+++ tests/warnings/.expect/self-assignment.txt	(revision b9afb1e033ae2616e2bbbabe865fb7932d0434dc)
@@ -1,11 +1,11 @@
-warnings/self-assignment.cfa:29:1 warning: self assignment of expression: Cast of:
+warnings/self-assignment.cfa:29:1 warning: self assignment of expression: Generated Cast of:
   Variable Expression: j: signed int
 ... to:
   reference to signed int
-warnings/self-assignment.cfa:30:1 warning: self assignment of expression: Cast of:
+warnings/self-assignment.cfa:30:1 warning: self assignment of expression: Generated Cast of:
   Variable Expression: s: instance of struct S with body 1
 ... to:
   reference to instance of struct S with body 1
-warnings/self-assignment.cfa:31:1 warning: self assignment of expression: Cast of:
+warnings/self-assignment.cfa:31:1 warning: self assignment of expression: Generated Cast of:
   Member Expression, with field:
     i: signed int
@@ -14,5 +14,5 @@
 ... to:
   reference to signed int
-warnings/self-assignment.cfa:32:1 warning: self assignment of expression: Cast of:
+warnings/self-assignment.cfa:32:1 warning: self assignment of expression: Generated Cast of:
   Member Expression, with field:
     i: signed int