Index: examples/Tuple.c
===================================================================
--- examples/Tuple.c	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ examples/Tuple.c	(revision cdbab558c7734aaa7ebe27165f8fc27f3514ad1a)
@@ -1,5 +1,6 @@
 int f( int, int );
 int g( int, int, int );
-static [ int, int *, * int, int ] h( int a, int b, * int c, [] char d );
+static
+[ int, int *, * int, int ] h( int a, int b, * int c, [] char d );
 
 struct inner {
@@ -14,5 +15,5 @@
 
 const volatile [ int, int ] t1;
-static const [ int, const int ] t2;
+static const [ int, int ] t2;
 const static [ int, const int ] t3;
 
@@ -21,14 +22,14 @@
 
 [ short x, unsigned y ] f1( int w ) {
-	[ y, x ] = [ x, y ] = [ w, 23 ];
+// 	return [ y, x ] = [ x, y ] = [ w, 23 ];
 }
 
 [ [ int, char, long, int ] r ] g1() {
-	short x, p;
+	short int x, p;
 	unsigned int y;
 	[ int, int ] z;
 
-	[ x, y, z ] = [ p, f( 17 ), 3 ];
-	[ x, y, z ] = ([short, unsigned int, [int, int]])([ p, f( 17 ), 3 ]);
+	[ x, y, z ] = [ p, f( 17, 18 ), 4, 3 ];
+//	[ x, y, z ] = ([short, unsigned int, [int, int]])([ p, f( 17, 18 ), 4, 3 ]);
 	r = [ x, y, z ];
 }
@@ -36,5 +37,5 @@
 [ int rc ] main( int argc, ** char argv ) {
 	int a, b, c, d;
-	struct outer t = { .[ f1,f4 ] : [ 1,7.0 ] };
+//	struct outer t = { .[ f1, f4 ] : [ 1, 7.0 ] };
 	f( [ 3,5 ] );
 	g( [ 3,5 ], 3 );
@@ -42,10 +43,12 @@
 	g( t1, 3 );
 
-	[ , , , ];						/* empty tuple */
+//	[ , , , ];						/* empty tuple */
 	[ 3, 5 ];
 	[ a, b ] = 3;
-	[ a, b ] = [ 4.6 ];
+//	[ a, b ] = [ 4.6 ];
+	[ a, b ] = 4.6;
 	[ a, b ] = [ c, d ] = [ 3, 5 ];
-	[ a, b, [ c ] ] = [ 2,[ a, b ] ];
+//	[ a, b, [ c ] ] = [ 2, [ a, b ] ];
+	[ a, b, c ] = [ 2, [ a, b ] ];
 	[ a, b ] = 3 > 4 ? [ b, 6 ] : [ 7, 8 ];
 
@@ -56,10 +59,10 @@
 	[ a, b ] = t1 = [ c, d ];
 	[ a, b ] = t1 = t2 = [ c, d ];
-	t1 = [ 3, 4 ] = [ 3, 4 ] = t1 = [ 3, 4 ];
+//	t1 = [ 3, 4 ] = [ 3, 4 ] = t1 = [ 3, 4 ];
 
 	s.[ f1, i.[ f2, f3 ], f4 ] = [ 11, 12, 13, 3.14159 ];
-	s.[ f1, i.[ f2, f3 ], f4 ] = h( 3, 3, 0, "abc" );
-	[ a, , b, ] = h( 3, 3, 0, "abc" );			/* ignore some results */
-	sp->[ f4,f1 ] = sp->[ f1, f4 ];
+//	s.[ f1, i.[ f2, f3 ], f4 ] = h( 3, 3, (* int)0, "abc" );
+//	[ a, , b, ] = h( 3, 3, 0, "abc" );			/* ignore some results */
+	sp->[ f4, f1 ] = sp->[ f1, f4 ];
 	printf( "expecting 3, 17, 23, 4; got %d, %d, %d, %d\n", s.[ f4, i.[ f3, f2 ], f1 ] );
 	rc = 0;