Index: tests/array-collections/.expect/dimexpr-match-c-ERRS.x86.txt
===================================================================
--- tests/array-collections/.expect/dimexpr-match-c-ERRS.x86.txt	(revision 090b07639c6b027e4addfbac740d04f8a642ae58)
+++ tests/array-collections/.expect/dimexpr-match-c-ERRS.x86.txt	(revision cd28605bcdaf022d1b2b5730527c9488d92363fb)
@@ -208,54 +208,4 @@
   Address of:
     Name: a  InitAlternative: pointer to array of float with dimension of Generated Cast of:
-    Sizeof Expression on: instance of type dim7 (not function type)
-    ... with resolved type:
-      unsigned long int
-  ... to:
-    unsigned int
-  ... with resolved type:
-    unsigned int
-array-collections/dimexpr-match-c.cfa:49:1 error: Invalid application of existing declaration(s) in expression Untyped Init Expression
-  Address of:
-    Name: a  InitAlternative: pointer to array of float with dimension of Generated Cast of:
-    Sizeof Expression on: instance of type dim7 (not function type)
-    ... with resolved type:
-      unsigned long int
-  ... to:
-    unsigned int
-  ... with resolved type:
-    unsigned int
-array-collections/dimexpr-match-c.cfa:49:1 error: Invalid application of existing declaration(s) in expression Untyped Init Expression
-  Address of:
-    Name: a  InitAlternative: pointer to array of float with dimension of Generated Cast of:
-    Sizeof Expression on: instance of type dim7 (not function type)
-    ... with resolved type:
-      unsigned long int
-  ... to:
-    unsigned int
-  ... with resolved type:
-    unsigned int
-array-collections/dimexpr-match-c.cfa:49:1 error: Invalid application of existing declaration(s) in expression Untyped Init Expression
-  Address of:
-    Name: a  InitAlternative: pointer to array of float with dimension of Generated Cast of:
-    Sizeof Expression on: instance of type dim7 (not function type)
-    ... with resolved type:
-      unsigned long int
-  ... to:
-    unsigned int
-  ... with resolved type:
-    unsigned int
-array-collections/dimexpr-match-c.cfa:49:1 error: Invalid application of existing declaration(s) in expression Untyped Init Expression
-  Address of:
-    Name: a  InitAlternative: pointer to array of float with dimension of Generated Cast of:
-    Sizeof Expression on: instance of type dim7 (not function type)
-    ... with resolved type:
-      unsigned long int
-  ... to:
-    unsigned int
-  ... with resolved type:
-    unsigned int
-array-collections/dimexpr-match-c.cfa:49:1 error: Invalid application of existing declaration(s) in expression Untyped Init Expression
-  Address of:
-    Name: a  InitAlternative: pointer to array of float with dimension of Generated Cast of:
     Variable Expression: enu7: const instance of enum __anonymous0 with body
     ... with resolved type:
@@ -307,4 +257,29 @@
 array-collections/dimexpr-match-c.cfa:49:1 error: Invalid application of existing declaration(s) in expression Untyped Init Expression
   Address of:
+    Name: a  InitAlternative: pointer to array of float with dimension of Sizeof Expression on: instance of type dim7 (not function type)
+  ... with resolved type:
+    unsigned int
+array-collections/dimexpr-match-c.cfa:49:1 error: Invalid application of existing declaration(s) in expression Untyped Init Expression
+  Address of:
+    Name: a  InitAlternative: pointer to array of float with dimension of Sizeof Expression on: instance of type dim7 (not function type)
+  ... with resolved type:
+    unsigned int
+array-collections/dimexpr-match-c.cfa:49:1 error: Invalid application of existing declaration(s) in expression Untyped Init Expression
+  Address of:
+    Name: a  InitAlternative: pointer to array of float with dimension of Sizeof Expression on: instance of type dim7 (not function type)
+  ... with resolved type:
+    unsigned int
+array-collections/dimexpr-match-c.cfa:49:1 error: Invalid application of existing declaration(s) in expression Untyped Init Expression
+  Address of:
+    Name: a  InitAlternative: pointer to array of float with dimension of Sizeof Expression on: instance of type dim7 (not function type)
+  ... with resolved type:
+    unsigned int
+array-collections/dimexpr-match-c.cfa:49:1 error: Invalid application of existing declaration(s) in expression Untyped Init Expression
+  Address of:
+    Name: a  InitAlternative: pointer to array of float with dimension of Sizeof Expression on: instance of type dim7 (not function type)
+  ... with resolved type:
+    unsigned int
+array-collections/dimexpr-match-c.cfa:49:1 error: Invalid application of existing declaration(s) in expression Untyped Init Expression
+  Address of:
     Name: a  InitAlternative: pointer to variable length array of float with dimension of Generated Cast of:
     Variable Expression: _array_dim16: const unsigned int
