Index: doc/papers/general/Paper.tex
===================================================================
--- doc/papers/general/Paper.tex	(revision 79d4186e1b45bad34ec6e2ad7a550f82989a8732)
+++ doc/papers/general/Paper.tex	(revision 14a3dad2e0f2e2f5519af8bee19bdacdbf8b5091)
@@ -2549,22 +2549,21 @@
 \begin{cfa}[xleftmargin=3\parindentlnth,aboveskip=0pt,belowskip=0pt]
 int main( int argc, char * argv[] ) {
-	ofstream out = { "cfa-out.txt" };
 	int max = 0, val = 42;
-	stack( int ) s, t;
-
-	REPEAT_TIMED( "push_int", N, push( s, val ); )
-	TIMED( "copy_int", t = s; )
-	TIMED( "clear_int", clear( s ); )
-	REPEAT_TIMED( "pop_int", N, int v = pop( t ); max = max( v, max ); )
-	REPEAT_TIMED( "print_int", N/2, out | val | ':' | val | endl; )
-
-	pair( _Bool, char ) max = { false, '\0' }, val = { true, 'a' };
-	stack( pair( _Bool, char ) ) s, t;
-
-	REPEAT_TIMED( "push_pair", N, push( s, val ); )
-	TIMED( "copy_pair", t = s; )
-	TIMED( "clear_pair", clear( s ); )
-	REPEAT_TIMED( "pop_pair", N, pair(_Bool, char) v = pop( t ); max = max( v, max ); )
-	REPEAT_TIMED( "print_pair", N/2, out | val | ':' | val | endl; )
+	stack( int ) si, ti;
+
+	REPEAT_TIMED( "push_int", N, push( si, val ); )
+	TIMED( "copy_int", ti = si; )
+	TIMED( "clear_int", clear( si ); )
+	REPEAT_TIMED( "pop_int", N, 
+		int x = pop( ti ); if ( x > max ) max = x; )
+
+	pair( _Bool, char ) max = { (_Bool)0, '\0' }, val = { (_Bool)1, 'a' };
+	stack( pair( _Bool, char ) ) sp, tp;
+
+	REPEAT_TIMED( "push_pair", N, push( sp, val ); )
+	TIMED( "copy_pair", tp = sp; )
+	TIMED( "clear_pair", clear( sp ); )
+	REPEAT_TIMED( "pop_pair", N,
+		pair(_Bool, char) x = pop( tp ); if ( x > max ) max = x; )
 }
 \end{cfa}