Index: tests/raii/.expect/ctor-autogen-ERR1.nast.txt
===================================================================
--- tests/raii/.expect/ctor-autogen-ERR1.nast.txt	(revision d7ae173cf134120772957b4772d6b5ac2ccb9806)
+++ 	(revision )
@@ -1,91 +1,0 @@
-raii/ctor-autogen.cfa:102:1 error: Unique best alternative includes deleted identifier in Generated Cast of:
-  Application of
-    Deleted Expression
-      Variable Expression: ?{}: static inline function
-      ... with parameters
-        reference to instance of struct Managed with body
-        signed int
-      ... returning nothing
-
-      ... with resolved type:
-        function
-        ... with parameters
-          reference to instance of struct Managed with body
-          signed int
-        ... returning nothing
-
-      ... deleted by: ?{}: function
-      ... with parameters
-        reference to instance of struct Managed with body
-      ... returning nothing
- with body
-        Compound Statement:
-          Expression Statement:
-            Application of
-              Variable Expression: ?=?: function
-              ... with parameters
-                reference to signed int
-                signed int
-              ... returning
-                signed int
-
-              ... with resolved type:
-                pointer to function
-                ... with parameters
-                  reference to signed int
-                  signed int
-                ... returning
-                  signed int
-
-              ... to arguments
-              Generated Cast of:
-                Member Expression, with field:
-                  x: signed int
-                ... from aggregate:
-                  Generated Cast of:
-                    Variable Expression: m: reference to instance of struct Managed with body
-                    ... with resolved type:
-                      reference to instance of struct Managed with body
-                  ... to:
-                    instance of struct Managed with body
-                  ... with resolved type:
-                    instance of struct Managed with body
-                ... with resolved type:
-                  signed int
-              ... to:
-                reference to signed int
-              ... with resolved type:
-                reference to signed int
-              Generated Cast of:
-                Constant Expression (0: zero_t)
-                ... with resolved type:
-                  zero_t
-              ... to:
-                signed int
-              ... with resolved type:
-                signed int
-
-            ... with resolved type:
-              signed int
-            ... with environment:
-              Types:
-
-
-    ... to arguments
-    Generated Cast of:
-      Variable Expression: x: instance of struct Managed with body
-      ... with resolved type:
-        instance of struct Managed with body
-    ... to:
-      reference to instance of struct Managed with body
-    ... with resolved type:
-      reference to instance of struct Managed with body
-    Constant Expression (123: signed int)
-    ... with resolved type:
-      signed int
-
-  ... with resolved type:
-    void
-... to: nothing
-... with resolved type:
-  void
Index: tests/raii/.expect/ctor-autogen-ERR1.oast.txt
===================================================================
--- tests/raii/.expect/ctor-autogen-ERR1.oast.txt	(revision d7ae173cf134120772957b4772d6b5ac2ccb9806)
+++ 	(revision )
@@ -1,98 +1,0 @@
-raii/ctor-autogen.cfa:102:1 error: Unique best alternative includes deleted identifier in Generated Cast of:
-  Application of
-    Deleted Expression
-      Variable Expression: ?{}: static inline function
-      ... with parameters
-        _dst: reference to instance of struct Managed with body 1
-        x: signed int
-      ... returning nothing
-
-      with resolved type:
-        function
-        ... with parameters
-          _dst: reference to instance of struct Managed with body 1
-          x: signed int
-        ... returning nothing
-
-      ... deleted by: ?{}: function
-      ... with parameters
-        m: reference to instance of struct Managed with body 1
-      ... returning nothing
-      ... with body
-        CompoundStmt
-          Expression Statement:
-            Application of
-              Variable Expression: ?=?: function
-              ... with parameters
-                intrinsic reference to signed int
-                intrinsic signed int
-              ... returning
-                _retval__operator_assign: signed int
-                ... with attributes:
-                  Attribute with name: unused
-
-
-              with resolved type:
-                pointer to function
-                ... with parameters
-                  intrinsic reference to signed int
-                  intrinsic signed int
-                ... returning
-                  _retval__operator_assign: signed int
-                  ... with attributes:
-                    Attribute with name: unused
-
-
-            ... to arguments
-              Generated Cast of:
-                Member Expression, with field:
-                  x: signed int
-                ... from aggregate:
-                  Generated Cast of:
-                    Variable Expression: m: reference to instance of struct Managed with body 1
-                    with resolved type:
-                      reference to instance of struct Managed with body 1
-                  ... to:
-                    instance of struct Managed with body 1
-                  with resolved type:
-                    instance of struct Managed with body 1
-                with resolved type:
-                  signed int
-              ... to:
-                reference to signed int
-              with resolved type:
-                reference to signed int
-              Generated Cast of:
-                constant expression (0 0: zero_t)
-                with resolved type:
-                  zero_t
-              ... to:
-                signed int
-              with resolved type:
-                signed int
-
-            with resolved type:
-              signed int
-            ... with environment:
-              Types:
-              Non-types:
-
-
-  ... to arguments
-    Generated Cast of:
-      Variable Expression: x: instance of struct Managed with body 1
-      with resolved type:
-        instance of struct Managed with body 1
-    ... to:
-      reference to instance of struct Managed with body 1
-    with resolved type:
-      reference to instance of struct Managed with body 1
-    constant expression (123 123: signed int)
-    with resolved type:
-      signed int
-
-  with resolved type:
-    void 
-... to: nothing
-with resolved type:
-  void 
Index: tests/raii/.expect/ctor-autogen-ERR1.txt
===================================================================
--- tests/raii/.expect/ctor-autogen-ERR1.txt	(revision e228f46559ffceeb1ba2edf67158058beed42eeb)
+++ tests/raii/.expect/ctor-autogen-ERR1.txt	(revision e228f46559ffceeb1ba2edf67158058beed42eeb)
@@ -0,0 +1,91 @@
+raii/ctor-autogen.cfa:102:1 error: Unique best alternative includes deleted identifier in Generated Cast of:
+  Application of
+    Deleted Expression
+      Variable Expression: ?{}: static inline function
+      ... with parameters
+        reference to instance of struct Managed with body
+        signed int
+      ... returning nothing
+
+      ... with resolved type:
+        function
+        ... with parameters
+          reference to instance of struct Managed with body
+          signed int
+        ... returning nothing
+
+      ... deleted by: ?{}: function
+      ... with parameters
+        reference to instance of struct Managed with body
+      ... returning nothing
+ with body
+        Compound Statement:
+          Expression Statement:
+            Application of
+              Variable Expression: ?=?: function
+              ... with parameters
+                reference to signed int
+                signed int
+              ... returning
+                signed int
+
+              ... with resolved type:
+                pointer to function
+                ... with parameters
+                  reference to signed int
+                  signed int
+                ... returning
+                  signed int
+
+              ... to arguments
+              Generated Cast of:
+                Member Expression, with field:
+                  x: signed int
+                ... from aggregate:
+                  Generated Cast of:
+                    Variable Expression: m: reference to instance of struct Managed with body
+                    ... with resolved type:
+                      reference to instance of struct Managed with body
+                  ... to:
+                    instance of struct Managed with body
+                  ... with resolved type:
+                    instance of struct Managed with body
+                ... with resolved type:
+                  signed int
+              ... to:
+                reference to signed int
+              ... with resolved type:
+                reference to signed int
+              Generated Cast of:
+                Constant Expression (0: zero_t)
+                ... with resolved type:
+                  zero_t
+              ... to:
+                signed int
+              ... with resolved type:
+                signed int
+
+            ... with resolved type:
+              signed int
+            ... with environment:
+              Types:
+
+
+    ... to arguments
+    Generated Cast of:
+      Variable Expression: x: instance of struct Managed with body
+      ... with resolved type:
+        instance of struct Managed with body
+    ... to:
+      reference to instance of struct Managed with body
+    ... with resolved type:
+      reference to instance of struct Managed with body
+    Constant Expression (123: signed int)
+    ... with resolved type:
+      signed int
+
+  ... with resolved type:
+    void
+... to: nothing
+... with resolved type:
+  void
Index: tests/raii/.expect/memberCtors-ERR1.nast.txt
===================================================================
--- tests/raii/.expect/memberCtors-ERR1.nast.txt	(revision d7ae173cf134120772957b4772d6b5ac2ccb9806)
+++ 	(revision )
@@ -1,1 +1,0 @@
-raii/memberCtors.cfa:92:1 error: in ?{}, field a2 used before being constructed
Index: tests/raii/.expect/memberCtors-ERR1.oast.txt
===================================================================
--- tests/raii/.expect/memberCtors-ERR1.oast.txt	(revision d7ae173cf134120772957b4772d6b5ac2ccb9806)
+++ 	(revision )
@@ -1,1 +1,0 @@
-raii/memberCtors.cfa:92:1 error: in void ?{}(B &b), field a2 used before being constructed
Index: tests/raii/.expect/memberCtors-ERR1.txt
===================================================================
--- tests/raii/.expect/memberCtors-ERR1.txt	(revision e228f46559ffceeb1ba2edf67158058beed42eeb)
+++ tests/raii/.expect/memberCtors-ERR1.txt	(revision e228f46559ffceeb1ba2edf67158058beed42eeb)
@@ -0,0 +1,1 @@
+raii/memberCtors.cfa:92:1 error: in ?{}, field a2 used before being constructed