Index: src/Common/PassVisitor.impl.h
===================================================================
--- src/Common/PassVisitor.impl.h	(revision 94dea962ecb08721f776abce4b76fdfc342043c7)
+++ src/Common/PassVisitor.impl.h	(revision 5da5a96e181569bad958a89a36b5b8f6567d4c09)
@@ -690,6 +690,6 @@
 	VISIT_START( node );
 
-	maybeAccept_impl( node->condition, *this );
-	maybeAccept_impl( node->message  , *this );
+	node->condition = visitExpression( node->condition );
+	maybeAccept_impl( node->message, *this );
 
 	VISIT_END( node );
@@ -700,6 +700,6 @@
 	MUTATE_START( node );
 
-	maybeMutate_impl( node->condition, *this );
-	maybeMutate_impl( node->message  , *this );
+	node->condition = mutateExpression( node->condition );
+	maybeMutate_impl( node->message, *this );
 
 	MUTATE_END( StaticAssertDecl, node );
Index: src/SymTab/Mangler.cc
===================================================================
--- src/SymTab/Mangler.cc	(revision 94dea962ecb08721f776abce4b76fdfc342043c7)
+++ src/SymTab/Mangler.cc	(revision 5da5a96e181569bad958a89a36b5b8f6567d4c09)
@@ -178,5 +178,5 @@
 				printQualifiers( pointerType );
 				mangleName << "P";
-				maybeAccept( pointerType->get_base(), *visitor );
+				maybeAccept( pointerType->base, *visitor );
 			}
 
@@ -185,5 +185,5 @@
 				printQualifiers( arrayType );
 				mangleName << "A0";
-				maybeAccept( arrayType->get_base(), *visitor );
+				maybeAccept( arrayType->base, *visitor );
 			}
 
@@ -191,5 +191,5 @@
 				printQualifiers( refType );
 				mangleName << "R";
-				maybeAccept( refType->get_base(), *visitor );
+				maybeAccept( refType->base, *visitor );
 			}
 
Index: src/tests/references.c
===================================================================
--- src/tests/references.c	(revision 94dea962ecb08721f776abce4b76fdfc342043c7)
+++ src/tests/references.c	(revision 5da5a96e181569bad958a89a36b5b8f6567d4c09)
@@ -45,4 +45,18 @@
 }
 
+// --- temporary code needed to make array of references subscript work.
+extern "C" {
+  void ** __index(__attribute__ ((unused)) size_t sizeof_T, __attribute__ ((unused)) size_t alignof_T, void **x, ptrdiff_t y) {
+    return (void **)((char *)x+y*sizeof(void *));
+  }
+  void __ctor(void ***dst, void **src) {
+    *dst = src;
+  }
+}
+__attribute__((alias("__index"))) forall( dtype T | sized(T) ) T && ?[?]( T & * x, ptrdiff_t y );
+__attribute__((alias("__ctor"))) forall( dtype DT ) void ?{}( DT & * & dst, DT & * src);
+forall( dtype DT ) void ^?{}( DT & * & ) {}
+// --- end of temporary code
+
 int main() {
 	int x = 123456, x2 = 789, *p1 = &x, **p2 = &p1, ***p3 = &p2,
@@ -52,9 +66,9 @@
 	*p3 = &p1;                          // change p2
 	int y = 0, z = 11, & ar[3] = { x, y, z };    // initialize array of references
-	// &ar[1] = &z;                        // change reference array element
-	// typeof( ar[1] ) p;                  // is int, i.e., the type of referenced object
-	// typeof( &ar[1] ) q;                 // is int &, i.e., the type of reference
-	// sizeof( ar[1] ) == sizeof( int );   // is true, i.e., the size of referenced object
-	// sizeof( &ar[1] ) == sizeof( int *); // is true, i.e., the size of a reference
+	&ar[1] = &z;                        // change reference array element
+	typeof( ar[1] ) p = 3;              // is int, i.e., the type of referenced object
+	typeof( &ar[1] ) q = &x;            // is int *, i.e., the type of pointer
+	_Static_assert( sizeof( ar[1] ) == sizeof( int ), "Array type should be int." );   // is true, i.e., the size of referenced object
+	_Static_assert( sizeof( &ar[1] ) == sizeof( int *), "Address of array should be int *." ); // is true, i.e., the size of a reference
 
 	((int*&)&r3) = &x;                  // change r1, (&*)**r3