Index: doc/theses/mike_brooks_MMath/programs/hello-accordion.cfa
===================================================================
--- doc/theses/mike_brooks_MMath/programs/hello-accordion.cfa	(revision e26a84207c9c592dbed209acfb363a8d8a58bbc1)
+++ doc/theses/mike_brooks_MMath/programs/hello-accordion.cfa	(revision f9ad69dc6e86c3c08876734b6909ce8978446504)
@@ -9,5 +9,5 @@
 
 forall( T, @[NprovTerty]@, @[Nmunicipalities]@ )
-struct CanadaPop {
+struct CanPop {
 	array( T, @NprovTerty@ ) provTerty; $\C{// nested VLA}$
 	array( T, @Nmunicipalities@ ) municipalities; $\C{// nested VLA}$
@@ -19,8 +19,8 @@
 
 forall( T, [NprovTerty], [Nmunicipalities] )
-	void ?{}( T &, CanadaPop( T, NprovTerty, Nmunicipalities ) & this ) {}
+	void ?{}( T &, CanPop( T, NprovTerty, Nmunicipalities ) & this ) {}
 
 forall( T &, [NprovTerty], [Nmunicipalities] )
-	void ^?{}( CanadaPop( T, NprovTerty, Nmunicipalities ) & this ) {}
+	void ^?{}( CanPop( T, NprovTerty, Nmunicipalities ) & this ) {}
 
 
@@ -39,5 +39,5 @@
 
 forall( T, [NprovTerty], [Nmunicipalities] )
-void check( CanadaPop( T, NprovTerty, Nmunicipalities ) & pop ) with( pop ) {
+void check( CanPop( T, NprovTerty, Nmunicipalities ) & pop ) with( pop ) {
 	total_pt = total_mun = 0;
 	for ( i; NprovTerty ) total_pt += provTerty[i];
@@ -60,5 +60,5 @@
 int main( int argc, char * argv[] ) {
 	const int npt = ato( argv[1] ), nmun = ato( argv[2] );
-	@CanadaPop( int, npt, nmun ) pop;@
+	@CanPop( int, npt, nmun ) pop;@
 	// read in population numbers
 	@check( pop );@
@@ -71,4 +71,7 @@
 Total province/territory: 36,991,981
 Total municipalities: 36,991,981
+$\$$ ./a.out  13  3654
+Total province/territory: 36,991,981
+Total municipalities: 36,991,981
 */
 
Index: doc/theses/mike_brooks_MMath/programs/hello-array.cfa
===================================================================
--- doc/theses/mike_brooks_MMath/programs/hello-array.cfa	(revision e26a84207c9c592dbed209acfb363a8d8a58bbc1)
+++ doc/theses/mike_brooks_MMath/programs/hello-array.cfa	(revision f9ad69dc6e86c3c08876734b6909ce8978446504)
@@ -9,5 +9,5 @@
 
 forall( [@N@] )								$\C{// array dimension}$
-array( bool, @N@) & f( array( float, @N@ ) & x, array( float, @N@ ) & y ) {
+array( bool, @N@ ) & f( array( float, @N@ ) & x, array( float, @N@ ) & y ) {
 	array( bool, @N@ ) & ret = *@alloc@();	$\C{// sizeof ret  used by alloc}$
 	for ( i; @N@ ) {
@@ -29,13 +29,13 @@
 
 int main( int argc, char * argv[] ) {
-	const int @n@ = ato( argv[1] );			$\C{// deduce conversion type}$
-	array( float, @n@ ) x, y;				$\C{// VLAs}$
-	for ( i; n ) {							$\C{// initialize arrays}$
+	const int @dim@ = ato( argv[1] );		$\C{// deduce conversion type}$
+	array( float, @dim@ ) x, y;				$\C{// VLAs}$
+	for ( i; dim ) {						$\C{// initialize arrays}$
 		x[i] = 3.14 / (i + 1);
 		y[i] = x[i] + 0.005 ;
 	}
-	array( bool, @n@ ) & result = @f( x, y )@; $\C{// call}$
+	array( bool, @dim@ ) & result = @f( x, y )@; $\C{// call}$
 	sout | "result: " | nonl;				$\C{// print result}$
-	for ( i; n )
+	for ( i; dim )
 		sout | result[i] | nonl;
 	sout | nl;
Index: doc/theses/mike_brooks_MMath/programs/hello-md.cfa
===================================================================
--- doc/theses/mike_brooks_MMath/programs/hello-md.cfa	(revision e26a84207c9c592dbed209acfb363a8d8a58bbc1)
+++ doc/theses/mike_brooks_MMath/programs/hello-md.cfa	(revision f9ad69dc6e86c3c08876734b6909ce8978446504)
@@ -138,5 +138,5 @@
 
 
-print1d_cstyle( m[ 2 ] );  $\C{// row 2:  2.0  2.1  2.2  2.3  2.4  2.5  2.6}$
+print1d_cstyle( @m[ 2 ]@ );  $\C{// row 2:  2.0  2.1  2.2  2.3  2.4  2.5  2.6}$