Index: tests/.expect/attributes.nast.x64.txt
===================================================================
--- tests/.expect/attributes.nast.x64.txt	(revision 18fe0fedb444d309ece6712b7ddfa116f5a9d4c9)
+++ tests/.expect/attributes.nast.x64.txt	(revision 914844e2d7ef286c83dea7a1d2a852cedef49269)
@@ -639,7 +639,7 @@
     __attribute__ ((unused)) signed int (*_X10_retval_f3PA0i_1)[];
 }
-__attribute__ ((unused,used,unused)) signed int (*_X2f4FFi_i____1())(signed int __anonymous_object1);
-__attribute__ ((unused,unused)) signed int (*_X2f4FFi_i____1())(__attribute__ ((unused)) signed int __anonymous_object2){
-    __attribute__ ((unused)) signed int (*_X10_retval_f4Fi_i__1)(signed int __anonymous_object3);
+__attribute__ ((unused,used,unused)) signed int (*_X2f4FFi_i____1())(signed int __param_0);
+__attribute__ ((unused,unused)) signed int (*_X2f4FFi_i____1())(signed int __param_0){
+    __attribute__ ((unused)) signed int (*_X10_retval_f4Fi_i__1)(signed int __param_0);
 }
 signed int _X3vtrFi___1(){
@@ -671,8 +671,8 @@
 signed int _X4tpr2Fi_PPi__1(__attribute__ ((unused,unused,unused,unused,unused,unused)) signed int **_X3FooPPi_1);
 signed int _X4tpr3Fi_Pi__1(__attribute__ ((unused,unused,unused)) signed int *_X3FooPi_1);
-signed int _X4tpr4Fi_Fi_Pi___1(__attribute__ ((unused,unused)) signed int (*__anonymous_object4)(__attribute__ ((unused,unused)) signed int __anonymous_object5[((unsigned long int )5)]));
+signed int _X4tpr4Fi_Fi_Pi___1(__attribute__ ((unused,unused)) signed int (*__anonymous_object1)(signed int __param_0[((unsigned long int )5)]));
 signed int _X4tpr5Fi_Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X3FooFi___1)());
 signed int _X4tpr6Fi_Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X3FooFi___1)());
-signed int _X4tpr7Fi_Fi_Fi_i____1(__attribute__ ((unused,unused)) signed int (*__anonymous_object6)(__attribute__ ((unused)) signed int (*__anonymous_object7)(__attribute__ ((unused,unused)) signed int __anonymous_object8)));
+signed int _X4tpr7Fi_Fi_Fi_i____1(__attribute__ ((unused,unused)) signed int (*__anonymous_object2)(signed int (*__param_0)(signed int __param_0)));
 signed int _X2adFi___1(){
     __attribute__ ((unused)) signed int _X10_retval_adi_1;
@@ -692,9 +692,9 @@
 
     {
-        ((void)sizeof(__attribute__ ((unused,unused,unused)) signed int [((unsigned long int )5)]));
-    }
-
-    {
-        ((void)sizeof(__attribute__ ((unused,unused,unused)) signed int (*)[((unsigned long int )10)]));
+        ((void)sizeof(__attribute__ ((unused,unused,unused)) signed int [5]));
+    }
+
+    {
+        ((void)sizeof(__attribute__ ((unused,unused,unused)) signed int (*)[10]));
     }
 
@@ -776,11 +776,11 @@
 
 }
-signed int _X4apd1Fi_PiPi__1(__attribute__ ((unused,unused,unused)) signed int *__anonymous_object9, __attribute__ ((unused,unused,unused)) signed int *__anonymous_object10);
-signed int _X4apd2Fi_PPiPPi__1(__attribute__ ((unused,unused,unused,unused)) signed int **__anonymous_object11, __attribute__ ((unused,unused,unused,unused)) signed int **__anonymous_object12);
-signed int _X4apd3Fi_PiPi__1(__attribute__ ((unused,unused,unused)) signed int *__anonymous_object13, __attribute__ ((unused,unused,unused)) signed int *__anonymous_object14);
-signed int _X4apd4Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object15)(), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object16)());
-signed int _X4apd5Fi_Fi_i_Fi_i___1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object17)(__attribute__ ((unused)) signed int __anonymous_object18), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object19)(__attribute__ ((unused)) signed int __anonymous_object20));
-signed int _X4apd6Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object21)(), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object22)());
-signed int _X4apd7Fi_Fi_i_Fi_i___1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object23)(__attribute__ ((unused)) signed int __anonymous_object24), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object25)(__attribute__ ((unused)) signed int __anonymous_object26));
+signed int _X4apd1Fi_PiPi__1(__attribute__ ((unused,unused,unused)) signed int *__anonymous_object3, __attribute__ ((unused,unused,unused)) signed int *__anonymous_object4);
+signed int _X4apd2Fi_PPiPPi__1(__attribute__ ((unused,unused,unused,unused)) signed int **__anonymous_object5, __attribute__ ((unused,unused,unused,unused)) signed int **__anonymous_object6);
+signed int _X4apd3Fi_PiPi__1(__attribute__ ((unused,unused,unused)) signed int *__anonymous_object7, __attribute__ ((unused,unused,unused)) signed int *__anonymous_object8);
+signed int _X4apd4Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object9)(), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object10)());
+signed int _X4apd5Fi_Fi_i_Fi_i___1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object11)(signed int __param_0), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object12)(signed int __param_0));
+signed int _X4apd6Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object13)(), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object14)());
+signed int _X4apd7Fi_Fi_i_Fi_i___1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object15)(signed int __param_0), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object16)(signed int __param_0));
 struct Vad {
     __attribute__ ((unused)) signed int :4;
Index: tests/errors/.expect/completeType.nast.x64.txt
===================================================================
--- tests/errors/.expect/completeType.nast.x64.txt	(revision 18fe0fedb444d309ece6712b7ddfa116f5a9d4c9)
+++ tests/errors/.expect/completeType.nast.x64.txt	(revision 914844e2d7ef286c83dea7a1d2a852cedef49269)
@@ -13,19 +13,16 @@
           function
         ... with parameters
-          intrinsic pointer to instance of type DT (not function type)
+          pointer to instance of type DT (not function type)
         ... returning
-          _retval__operator_deref: reference to instance of type DT (not function type)
-          ... with attributes:
-            Attribute with name: unused
+          reference to instance of type DT (not function type)
 
-
-      ... to arguments
-        Variable Expression: x: pointer to instance of struct A with body 0
+        ... to arguments
+        Variable Expression: x: pointer to instance of struct B with body
 
     ... to: nothing
   (types:
-    void 
+    void
   )
-  Environment: -> instance of struct A with body 0 (no widening)
+  Environment:( _99_2_DT ) -> instance of struct B with body (no widening)
 
 
@@ -36,43 +33,40 @@
           function
         ... with parameters
-          intrinsic pointer to instance of type DT (not function type)
+          pointer to instance of type DT (not function type)
         ... returning
-          _retval__operator_deref: reference to instance of type DT (not function type)
-          ... with attributes:
-            Attribute with name: unused
+          reference to instance of type DT (not function type)
 
-
-      ... to arguments
-        Variable Expression: x: pointer to instance of struct B with body 1
+        ... to arguments
+        Variable Expression: x: pointer to instance of struct A without body
 
     ... to: nothing
   (types:
-    void 
+    void
   )
-  Environment: -> instance of struct B with body 1 (no widening)
+  Environment:( _99_2_DT ) -> instance of struct A without body (no widening)
 
 
 
-errors/completeType.cfa:35:1 error: No reasonable alternatives for expression Applying untyped:
+errors/completeType.cfa:35:1 error: Invalid application of existing declaration(s) in expression Applying untyped:
   Name: foo
 ...to:
   Name: v
 
-errors/completeType.cfa:36:1 error: No reasonable alternatives for expression Applying untyped:
+errors/completeType.cfa:36:1 error: Invalid application of existing declaration(s) in expression Applying untyped:
   Name: baz
 ...to:
   Name: v
 
-errors/completeType.cfa:37:1 error: No reasonable alternatives for expression Applying untyped:
+errors/completeType.cfa:37:1 error: Invalid application of existing declaration(s) in expression Applying untyped:
   Name: quux
 ...to:
   Name: v
 
-errors/completeType.cfa:59:1 error: No reasonable alternatives for expression Applying untyped:
+errors/completeType.cfa:59:1 error: Invalid application of existing declaration(s) in expression Applying untyped:
   Name: baz
 ...to:
   Name: y
 
-errors/completeType.cfa:60:1 error: No reasonable alternatives for expression Applying untyped:
+errors/completeType.cfa:60:1 error: Invalid application of existing declaration(s) in expression Applying untyped:
   Name: quux
 ...to:
@@ -94,8 +88,5 @@
                   instance of type T (not function type)
                 ... returning
-                  _retval__operator_assign: instance of type T (not function type)
-                  ... with attributes:
-                    Attribute with name: unused
-
+                  instance of type T (not function type)
 
                 ?{}: pointer to function
@@ -121,21 +112,19 @@
             ... returning nothing
 
-          ... to arguments
+            ... to arguments
             Variable Expression: z: pointer to instance of type T (not function type)
+          with 1 pending inference slots
 
         (types:
-          void 
+          void
         )
-        Environment: -> instance of type T (not function type) (no widening)
+        Environment:( _118_0_T ) -> instance of type T (not function type) (no widening)
 
       Could not satisfy assertion:
 ?=?: pointer to function
         ... with parameters
-          reference to instance of type _110_0_T (not function type)
-          instance of type _110_0_T (not function type)
+          reference to instance of type _118_0_T (not function type)
+          instance of type _118_0_T (not function type)
         ... returning
-          _retval__operator_assign: instance of type _110_0_T (not function type)
-          ... with attributes:
-            Attribute with name: unused
+          instance of type _118_0_T (not function type)
 
-