Index: doc/papers/general/evaluation/cfa-bench.c
===================================================================
--- doc/papers/general/evaluation/cfa-bench.c	(revision ab3251e7b1e2774d12d8f27428f99ce3416ce632)
+++ doc/papers/general/evaluation/cfa-bench.c	(revision c9b3a41837b8fea7996975a412426dc2a119d45f)
@@ -1,3 +1,4 @@
-#include <stdio.h>
+#include <fstream>
+#include <stdlib>
 #include "bench.h"
 #include "cfa-stack.h"
@@ -5,27 +6,22 @@
 #include "cfa-print.h"
 
-int main( int argc, char *argv[] ) {
-	FILE * out = fopen( "/dev/null", "w" );
-	int maxi = 0, vali = 42;
-	stack(int) si, ti;
+int main( int argc, char * argv[] ) {
+	ofstream out = { "/dev/null" };
+	int max = 0, val = 42;
+	stack( int ) si, t;
 
-	REPEAT_TIMED( "push_int", N, push( &si, vali ); )
-	TIMED( "copy_int", ti = si; )
-	TIMED( "clear_int", clear( &si ); )
-	REPEAT_TIMED( "pop_int", N, 
-		int xi = pop( &ti ); 
-		if ( xi > maxi ) { maxi = xi; } )
-	REPEAT_TIMED( "print_int", N/2, print( out, vali, ":", vali, "\n" ); )
+	REPEAT_TIMED( "push_int", N, push( si, val ); )
+	TIMED( "copy_int", t = si; )
+	TIMED( "clear_int", clear( si ); )
+	REPEAT_TIMED( "pop_int", N, int x = pop( t ); max = max( x, max ); )
+	REPEAT_TIMED( "print_int", N/2, out | val | ':' | val | endl; )
 
-	pair(_Bool, char) maxp = { (_Bool)0, '\0' }, valp = { (_Bool)1, 'a' };
-	stack(pair(_Bool, char)) sp, tp;
+	pair( _Bool, char ) max = { (_Bool)0, '\0' }, val = { (_Bool)1, 'a' };
+	stack( pair( _Bool, char ) ) s, t;
 
-	REPEAT_TIMED( "push_pair", N, push( &sp, valp ); )
-	TIMED( "copy_pair", tp = sp; )
-	TIMED( "clear_pair", clear( &sp ); )
-	REPEAT_TIMED( "pop_pair", N, 
-		pair(_Bool, char) xp = pop( &tp ); 
-		if ( xp > maxp ) { maxp = xp; } )
-	REPEAT_TIMED( "print_pair", N/2, print( out, valp, ":", valp, "\n" ); )
-	fclose(out);
+	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) x = pop( t ); max = max( x, max ); )
+	REPEAT_TIMED( "print_pair", N/2, out | val | ':' | val | endl; )
 }
Index: doc/papers/general/evaluation/cfa-pair.c
===================================================================
--- doc/papers/general/evaluation/cfa-pair.c	(revision ab3251e7b1e2774d12d8f27428f99ce3416ce632)
+++ doc/papers/general/evaluation/cfa-pair.c	(revision c9b3a41837b8fea7996975a412426dc2a119d45f)
@@ -1,3 +1,4 @@
 #include "cfa-pair.h"
+#include "fstream"
 
 forall(otype R, otype S 
@@ -34,2 +35,8 @@
 	return p.first > q.first || ( p.first == q.first && p.second >= q.second );
 }
+
+forall(otype R, otype S)
+forall(dtype ostype | ostream( ostype ) | { ostype & ?|?( ostype &, pair(R, S) ); })
+ostype & ?|?( ostype & os, pair(R, S) p ) {
+	return os | '[' | p.first | ',' | p.second | ']';
+} // ?|?
Index: doc/papers/general/evaluation/cfa-pair.h
===================================================================
--- doc/papers/general/evaluation/cfa-pair.h	(revision ab3251e7b1e2774d12d8f27428f99ce3416ce632)
+++ doc/papers/general/evaluation/cfa-pair.h	(revision c9b3a41837b8fea7996975a412426dc2a119d45f)
@@ -1,3 +1,5 @@
 #pragma once
+
+#include "iostream"
 
 forall(otype R, otype S) struct pair {
@@ -27,2 +29,6 @@
 	| { int ?==?(R, R); int ?>?(R, R); int ?>=?(S, S); })
 int ?>=?(pair(R, S) p, pair(R, S) q);
+
+forall(otype R, otype S)
+forall(dtype ostype | ostream( ostype ) | { ostype & ?|?( ostype &, pair(R, S) ); })
+ostype & ?|?( ostype & os, pair(R, S) );
Index: doc/papers/general/evaluation/cfa-stack.c
===================================================================
--- doc/papers/general/evaluation/cfa-stack.c	(revision ab3251e7b1e2774d12d8f27428f99ce3416ce632)
+++ doc/papers/general/evaluation/cfa-stack.c	(revision c9b3a41837b8fea7996975a412426dc2a119d45f)
@@ -4,14 +4,18 @@
 forall(otype T) struct stack_node {
 	T value;
-	stack_node(T)* next;
+	stack_node(T) * next;
 };
+forall(otype T) void ?{}( stack_node(T) & node, T value, stack_node(T) * next ) {
+    node.value = value;
+    node.next = next;
+}
 
-forall(otype T) void ?{}(stack(T)* s) { (&s->head){ 0 }; }
+forall(otype T) void ?{}( stack(T) & s ) { (s.head){ 0 }; }
 
-forall(otype T) void ?{}(stack(T)* s, stack(T) t) {
-	stack_node(T)** crnt = &s->head;
-	for ( stack_node(T)* next = t.head; next; next = next->next ) {
-		*crnt = ((stack_node(T)*)malloc()){ next->value }; /***/
-		stack_node(T)* acrnt = *crnt;
+forall(otype T) void ?{}( stack(T) & s, stack(T) t ) {
+	stack_node(T) ** crnt = &s.head;
+	for ( stack_node(T) * next = t.head; next; next = next->next ) {
+	    *crnt = new( next->value, 0 );
+		stack_node(T) * acrnt = *crnt;
 		crnt = &acrnt->next;
 	}
@@ -19,34 +23,34 @@
 }
 
-forall(otype T) stack(T) ?=?(stack(T)* s, stack(T) t) {
-	if ( s->head == t.head ) return *s;
-	clear(s);
+forall(otype T) stack(T) ?=?( stack(T) & s, stack(T) t ) {
+	if ( s.head == t.head ) return s;
+	clear( s );
 	s{ t };
-	return *s;
+	return s;
 }
 
-forall(otype T) void ^?{}(stack(T)* s) { clear(s); }
+forall(otype T) void ^?{}( stack(T) & s) { clear( s ); }
 
-forall(otype T) _Bool empty(const stack(T)* s) { return s->head == 0; }
+forall(otype T) _Bool empty( const stack(T) & s ) { return s.head == 0; }
 
-forall(otype T) void push(stack(T)* s, T value) {
-	s->head = ((stack_node(T)*)malloc()){ value, s->head }; /***/
+forall(otype T) void push( stack(T) & s, T value ) {
+    s.head = new( value, s.head );
 }
 
-forall(otype T) T pop(stack(T)* s) {
-	stack_node(T)* n = s->head;
-	s->head = n->next;
-	T x = n->value;
-	^n{};
-	free(n);
-	return x;
+forall(otype T) T pop( stack(T) & s ) {
+	stack_node(T) * n = s.head;
+	s.head = n->next;
+	T v = n->value;
+//	^n{};
+	free( n );
+	return v;
 }
 
-forall(otype T) void clear(stack(T)* s) {
-    for ( stack_node(T)* next = s->head; next; ) {
-		stack_node(T)* crnt = next;
+forall(otype T) void clear( stack(T) & s ) {
+	for ( stack_node(T) * next = s.head; next; ) {
+		stack_node(T) * crnt = next;
 		next = crnt->next;
-		delete(crnt);
+		delete( crnt );
 	}
-	s->head = 0;
+	s.head = 0;
 }
Index: doc/papers/general/evaluation/cfa-stack.h
===================================================================
--- doc/papers/general/evaluation/cfa-stack.h	(revision ab3251e7b1e2774d12d8f27428f99ce3416ce632)
+++ doc/papers/general/evaluation/cfa-stack.h	(revision c9b3a41837b8fea7996975a412426dc2a119d45f)
@@ -3,14 +3,14 @@
 forall(otype T) struct stack_node;
 forall(otype T) struct stack {
-	stack_node(T)* head;
+	stack_node(T) * head;
 };
 
-forall(otype T) void ?{}(stack(T)* s);
-forall(otype T) void ?{}(stack(T)* s, stack(T) t);
-forall(otype T) stack(T) ?=?(stack(T)* s, stack(T) t);
-forall(otype T) void ^?{}(stack(T)* s);
+forall(otype T) void ?{}( stack(T) & s );
+forall(otype T) void ?{}( stack(T) & s, stack(T) t );
+forall(otype T) stack(T) ?=?( stack(T) & s, stack(T) t );
+forall(otype T) void ^?{}( stack(T) & s);
 
-forall(otype T) _Bool empty(const stack(T)* s);
-forall(otype T) void push(stack(T)* s, T value);
-forall(otype T) T pop(stack(T)* s);
-forall(otype T) void clear(stack(T)* s);
+forall(otype T) _Bool empty( const stack(T) & s );
+forall(otype T) void push( stack(T) & s, T value );
+forall(otype T) T pop( stack(T) & s );
+forall(otype T) void clear( stack(T) & s );