Index: tests/.expect/castError.txt
===================================================================
--- tests/.expect/castError.txt	(revision d5f46131be643704ce63e4727b87001e3c5f3459)
+++ tests/.expect/castError.txt	(revision 207c733028dc24fd806488429df8d9fc295a45e2)
@@ -3,6 +3,4 @@
   Name: f
 ... to:
-  char
-with resolved type:
   char Alternatives are:
 Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
@@ -11,12 +9,5 @@
       ... returning nothing
 
-      with resolved type:
-        pointer to function
-          accepting unspecified arguments
-        ... returning nothing
-
     ... to:
-      char
-    with resolved type:
       char
   (types:
@@ -27,9 +18,5 @@
 Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
       Variable Expression: f: double
-      with resolved type:
-        double
     ... to:
-      char
-    with resolved type:
       char
   (types:
@@ -40,9 +27,5 @@
 Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
       Variable Expression: f: signed int
-      with resolved type:
-        signed int
     ... to:
-      char
-    with resolved type:
       char
   (types:
@@ -56,23 +39,11 @@
   Comma Expression:
     constant expression (3 3: signed int)
-    with resolved type:
-      signed int
     Name: v
-... to: nothing
-with resolved type:
-  void  Alternatives are:
+... to: nothing Alternatives are:
 Cost ( 0, 0, 2, 0, 0, 0, 0 ): Generated Cast of:
       Comma Expression:
         constant expression (3 3: signed int)
-        with resolved type:
-          signed int
         Variable Expression: v: unsigned char
-        with resolved type:
-          unsigned char
-      with resolved type:
-        unsigned char
     ... to: nothing
-    with resolved type:
-      void 
   (types:
     void 
@@ -83,14 +54,6 @@
       Comma Expression:
         constant expression (3 3: signed int)
-        with resolved type:
-          signed int
         Variable Expression: v: signed short int
-        with resolved type:
-          signed short int
-      with resolved type:
-        signed short int
     ... to: nothing
-    with resolved type:
-      void 
   (types:
     void 
@@ -106,7 +69,2 @@
     char
 
-with resolved type:
-  instance of struct S with body 1
-  ... with parameters
-    char
-
Index: tests/.expect/init1.txt
===================================================================
--- tests/.expect/init1.txt	(revision d5f46131be643704ce63e4727b87001e3c5f3459)
+++ tests/.expect/init1.txt	(revision 207c733028dc24fd806488429df8d9fc295a45e2)
@@ -11,6 +11,4 @@
 ... to:
   reference to signed int
-with resolved type:
-  reference to signed int
 init1.cfa:97:1 error: No reasonable alternatives for expression Applying untyped:
   Name: ?{}
@@ -18,9 +16,5 @@
   Generated Cast of:
     Variable Expression: _retval_f_py: pointer to signed int
-    with resolved type:
-      pointer to signed int
   ... to:
-    reference to pointer to signed int
-  with resolved type:
     reference to pointer to signed int
   Name: px
@@ -30,6 +24,4 @@
 ... to:
   reference to float
-with resolved type:
-  reference to float
 init1.cfa:107:1 error: No reasonable alternatives for expression Applying untyped:
   Name: ?{}
@@ -37,9 +29,5 @@
   Generated Cast of:
     Variable Expression: _retval_f_py2: pointer to float
-    with resolved type:
-      pointer to float
   ... to:
-    reference to pointer to float
-  with resolved type:
     reference to pointer to float
   Name: cpx
@@ -49,6 +37,4 @@
 ... to:
   reference to instance of type T (not function type)
-with resolved type:
-  reference to instance of type T (not function type)
 init1.cfa:118:1 error: No reasonable alternatives for expression Applying untyped:
   Name: ?{}
@@ -56,9 +42,5 @@
   Generated Cast of:
     Variable Expression: _retval_anycvt: pointer to instance of type T (not function type)
-    with resolved type:
-      pointer to instance of type T (not function type)
   ... to:
-    reference to pointer to instance of type T (not function type)
-  with resolved type:
     reference to pointer to instance of type T (not function type)
   Name: s
Index: tests/errors/.expect/completeType.x64.txt
===================================================================
--- tests/errors/.expect/completeType.x64.txt	(revision d5f46131be643704ce63e4727b87001e3c5f3459)
+++ tests/errors/.expect/completeType.x64.txt	(revision 207c733028dc24fd806488429df8d9fc295a45e2)
@@ -6,7 +6,5 @@
     Name: x
 
-... to: nothing
-with resolved type:
-  void  Alternatives are:
+... to: nothing Alternatives are:
 Cost ( 0, 1, 2, 0, 1, -1, 0 ): Generated Cast of:
       Application of
@@ -22,26 +20,8 @@
 
 
-        with resolved type:
-          pointer to forall
-            _90_4_DT: data type
-            function
-          ... with parameters
-            intrinsic pointer to instance of type _90_4_DT (not function type)
-          ... returning
-            _retval__operator_deref: reference to instance of type _90_4_DT (not function type)
-            ... with attributes:
-              Attribute with name: unused
-
-
       ... to arguments
         Variable Expression: x: pointer to instance of struct A with body 0
-        with resolved type:
-          pointer to instance of struct A with body 0
 
-      with resolved type:
-        reference to instance of struct A with body 0
     ... to: nothing
-    with resolved type:
-      void 
   (types:
     void 
@@ -63,26 +43,8 @@
 
 
-        with resolved type:
-          pointer to forall
-            _90_4_DT: data type
-            function
-          ... with parameters
-            intrinsic pointer to instance of type _90_4_DT (not function type)
-          ... returning
-            _retval__operator_deref: reference to instance of type _90_4_DT (not function type)
-            ... with attributes:
-              Attribute with name: unused
-
-
       ... to arguments
         Variable Expression: x: pointer to instance of struct B with body 1
-        with resolved type:
-          pointer to instance of struct B with body 1
 
-      with resolved type:
-        reference to instance of struct B with body 1
     ... to: nothing
-    with resolved type:
-      void 
   (types:
     void 
@@ -159,47 +121,7 @@
             ... returning nothing
 
-            with resolved type:
-              pointer to forall
-                _109_0_T: sized data type
-                ... with assertions
-                  ?=?: pointer to function
-                  ... with parameters
-                    reference to instance of type _109_0_T (not function type)
-                    instance of type _109_0_T (not function type)
-                  ... returning
-                    _retval__operator_assign: instance of type _109_0_T (not function type)
-                    ... with attributes:
-                      Attribute with name: unused
-
-
-                  ?{}: pointer to function
-                  ... with parameters
-                    reference to instance of type _109_0_T (not function type)
-                  ... returning nothing
-
-                  ?{}: pointer to function
-                  ... with parameters
-                    reference to instance of type _109_0_T (not function type)
-                    instance of type _109_0_T (not function type)
-                  ... returning nothing
-
-                  ^?{}: pointer to function
-                  ... with parameters
-                    reference to instance of type _109_0_T (not function type)
-                  ... returning nothing
-
-
-                function
-              ... with parameters
-                pointer to instance of type _109_0_T (not function type)
-              ... returning nothing
-
           ... to arguments
             Variable Expression: z: pointer to instance of type T (not function type)
-            with resolved type:
-              pointer to instance of type T (not function type)
 
-          with resolved type:
-            void 
         (types:
           void 
Index: tests/raii/.expect/ctor-autogen-ERR1.txt
===================================================================
--- tests/raii/.expect/ctor-autogen-ERR1.txt	(revision d5f46131be643704ce63e4727b87001e3c5f3459)
+++ tests/raii/.expect/ctor-autogen-ERR1.txt	(revision 207c733028dc24fd806488429df8d9fc295a45e2)
@@ -7,11 +7,4 @@
         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
@@ -33,15 +26,4 @@
 
 
-              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:
@@ -51,27 +33,13 @@
                   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:
@@ -82,17 +50,7 @@
     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/warnings/.expect/self-assignment.txt
===================================================================
--- tests/warnings/.expect/self-assignment.txt	(revision d5f46131be643704ce63e4727b87001e3c5f3459)
+++ tests/warnings/.expect/self-assignment.txt	(revision 207c733028dc24fd806488429df8d9fc295a45e2)
@@ -1,17 +1,9 @@
 warnings/self-assignment.cfa:29:1 warning: self assignment of expression: Generated Cast of:
   Variable Expression: j: signed int
-  with resolved type:
-    signed int
 ... to:
-  reference to signed int
-with resolved type:
   reference to signed int
 warnings/self-assignment.cfa:30:1 warning: self assignment of expression: Generated Cast of:
   Variable Expression: s: instance of struct S with body 1
-  with resolved type:
-    instance of struct S with body 1
 ... to:
-  reference to instance of struct S with body 1
-with resolved type:
   reference to instance of struct S with body 1
 warnings/self-assignment.cfa:31:1 warning: self assignment of expression: Generated Cast of:
@@ -20,11 +12,5 @@
   ... from aggregate:
     Variable Expression: s: instance of struct S with body 1
-    with resolved type:
-      instance of struct S with body 1
-  with resolved type:
-    signed int
 ... to:
-  reference to signed int
-with resolved type:
   reference to signed int
 warnings/self-assignment.cfa:32:1 warning: self assignment of expression: Generated Cast of:
@@ -36,12 +22,4 @@
     ... from aggregate:
       Variable Expression: t: instance of struct T with body 1
-      with resolved type:
-        instance of struct T with body 1
-    with resolved type:
-      instance of struct S with body 1
-  with resolved type:
-    signed int
 ... to:
   reference to signed int
-with resolved type:
-  reference to signed int
