Index: tests/.expect/alloc-ERROR.txt
===================================================================
--- tests/.expect/alloc-ERROR.txt	(revision 762fbc1ffb7ffc049f20e456e655c8289f8e19f5)
+++ tests/.expect/alloc-ERROR.txt	(revision 03a4c732c41cec6ae90263ab98f94f3c2ea795c4)
@@ -16,4 +16,6 @@
           Name: stp
 
+      with resolved type:
+        unsigned long int
 
 
@@ -28,4 +30,6 @@
     Name: stp
     constant expression (10 10: signed int)
+    with resolved type:
+      signed int
 
 
Index: tests/.expect/castError.txt
===================================================================
--- tests/.expect/castError.txt	(revision 762fbc1ffb7ffc049f20e456e655c8289f8e19f5)
+++ tests/.expect/castError.txt	(revision 03a4c732c41cec6ae90263ab98f94f3c2ea795c4)
@@ -3,4 +3,6 @@
   Name: f
 ... to:
+  char
+with resolved type:
   char Alternatives are:
 Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
@@ -9,5 +11,12 @@
       ... returning nothing
 
+      with resolved type:
+        pointer to function
+          accepting unspecified arguments
+        ... returning nothing
+
     ... to:
+      char
+    with resolved type:
       char
   (types:
@@ -18,5 +27,9 @@
 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:
@@ -27,5 +40,9 @@
 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:
@@ -39,11 +56,23 @@
   Comma Expression:
     constant expression (3 3: signed int)
+    with resolved type:
+      signed int
     Name: v
-... to: nothing Alternatives are:
+... to: nothing
+with resolved type:
+  void  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 
@@ -54,6 +83,14 @@
       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 
@@ -69,2 +106,7 @@
     char
 
+with resolved type:
+  instance of struct S with body 1
+  ... with parameters
+    char
+
Index: tests/.expect/init1.txt
===================================================================
--- tests/.expect/init1.txt	(revision 762fbc1ffb7ffc049f20e456e655c8289f8e19f5)
+++ tests/.expect/init1.txt	(revision 03a4c732c41cec6ae90263ab98f94f3c2ea795c4)
@@ -11,4 +11,6 @@
 ... 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: ?{}
@@ -16,5 +18,9 @@
   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
@@ -24,4 +30,6 @@
 ... to:
   reference to float
+with resolved type:
+  reference to float
 init1.cfa:107:1 error: No reasonable alternatives for expression Applying untyped:
   Name: ?{}
@@ -29,5 +37,9 @@
   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
@@ -37,4 +49,6 @@
 ... 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: ?{}
@@ -42,5 +56,9 @@
   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 762fbc1ffb7ffc049f20e456e655c8289f8e19f5)
+++ tests/errors/.expect/completeType.x64.txt	(revision 03a4c732c41cec6ae90263ab98f94f3c2ea795c4)
@@ -6,5 +6,7 @@
     Name: x
 
-... to: nothing Alternatives are:
+... to: nothing
+with resolved type:
+  void  Alternatives are:
 Cost ( 0, 1, 2, 0, 1, -1, 0 ): Generated Cast of:
       Application of
@@ -20,8 +22,26 @@
 
 
+        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 
@@ -43,8 +63,26 @@
 
 
+        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 
@@ -121,7 +159,47 @@
             ... 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/errors/.expect/completeType.x86.txt
===================================================================
--- tests/errors/.expect/completeType.x86.txt	(revision 762fbc1ffb7ffc049f20e456e655c8289f8e19f5)
+++ tests/errors/.expect/completeType.x86.txt	(revision 03a4c732c41cec6ae90263ab98f94f3c2ea795c4)
@@ -6,5 +6,7 @@
     Name: x
 
-... to: nothing Alternatives are:
+... to: nothing
+with resolved type:
+  void  Alternatives are:
 Cost ( 0, 1, 2, 0, 1, -1, 0 ): Generated Cast of:
       Application of
@@ -20,8 +22,26 @@
 
 
+        with resolved type:
+          pointer to forall
+            _89_4_DT: data type
+            function
+          ... with parameters
+            intrinsic pointer to instance of type _89_4_DT (not function type)
+          ... returning
+            _retval__operator_deref: reference to instance of type _89_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 
@@ -43,8 +63,26 @@
 
 
+        with resolved type:
+          pointer to forall
+            _89_4_DT: data type
+            function
+          ... with parameters
+            intrinsic pointer to instance of type _89_4_DT (not function type)
+          ... returning
+            _retval__operator_deref: reference to instance of type _89_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 
@@ -121,7 +159,47 @@
             ... returning nothing
 
+            with resolved type:
+              pointer to forall
+                _108_0_T: sized data type
+                ... with assertions
+                  ?=?: pointer to function
+                  ... with parameters
+                    reference to instance of type _108_0_T (not function type)
+                    instance of type _108_0_T (not function type)
+                  ... returning
+                    _retval__operator_assign: instance of type _108_0_T (not function type)
+                    ... with attributes:
+                      Attribute with name: unused
+
+
+                  ?{}: pointer to function
+                  ... with parameters
+                    reference to instance of type _108_0_T (not function type)
+                  ... returning nothing
+
+                  ?{}: pointer to function
+                  ... with parameters
+                    reference to instance of type _108_0_T (not function type)
+                    instance of type _108_0_T (not function type)
+                  ... returning nothing
+
+                  ^?{}: pointer to function
+                  ... with parameters
+                    reference to instance of type _108_0_T (not function type)
+                  ... returning nothing
+
+
+                function
+              ... with parameters
+                pointer to instance of type _108_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 762fbc1ffb7ffc049f20e456e655c8289f8e19f5)
+++ tests/raii/.expect/ctor-autogen-ERR1.txt	(revision 03a4c732c41cec6ae90263ab98f94f3c2ea795c4)
@@ -7,4 +7,11 @@
         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
@@ -26,4 +33,15 @@
 
 
+              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:
@@ -33,13 +51,27 @@
                   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:
@@ -50,7 +82,17 @@
     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 762fbc1ffb7ffc049f20e456e655c8289f8e19f5)
+++ tests/warnings/.expect/self-assignment.txt	(revision 03a4c732c41cec6ae90263ab98f94f3c2ea795c4)
@@ -1,9 +1,17 @@
 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:
@@ -12,5 +20,11 @@
   ... 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:
@@ -22,4 +36,12 @@
     ... 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
