Index: src/Tests/ResolvExpr/Abstype.c
===================================================================
--- src/Tests/ResolvExpr/Abstype.c	(revision 843054c23fcb725d2486e5e42e91b3741bc523b8)
+++ src/Tests/ResolvExpr/Abstype.c	(revision cd623a4e93c2eeb566858071f03b3e141d60d50c)
@@ -3,19 +3,17 @@
 type T | { T x( T ); };
 
-T y( T t )
-{
+T y( T t ) {
 	T t_instance;
 	return x( t );
 }
 
-forall(type T) lvalue T			*?(                T* );
-int		?++( int *);
-int ?=?( int*, int );
-forall(dtype DT) DT* 		   	?=?(                DT *          *,          DT* );
+forall( type T ) lvalue T *?( T * );
+int ?++( int *);
+int ?=?( int *, int );
+forall( dtype DT ) DT * ?=?( DT **, DT * );
 
-type U = int*;
+type U = int *;
 
-U x( U u )
-{
+U x( U u ) {
 	U u_instance = u;
 	(*u)++;
@@ -23,6 +21,9 @@
 }
 
-int *break_abstraction( U u )
-{
+int *break_abstraction( U u ) {
 	return u;
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/ResolvExpr/Attributes.c
===================================================================
--- src/Tests/ResolvExpr/Attributes.c	(revision 843054c23fcb725d2486e5e42e91b3741bc523b8)
+++ src/Tests/ResolvExpr/Attributes.c	(revision cd623a4e93c2eeb566858071f03b3e141d60d50c)
@@ -1,4 +1,2 @@
-// "cfa-cpp -ne simple.c"
-
 int @voon;
 double @voon;
@@ -9,11 +7,13 @@
 void g( int );
 
-void
-f()
-{
-  float x;
-  double x;
-  @bort(x);
-  @bort(int);
-  g( @voon );
+void f() {
+	float x;
+	double x;
+	@bort(x);
+	@bort(int);
+	g( @voon );
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/ResolvExpr/Cast.c
===================================================================
--- src/Tests/ResolvExpr/Cast.c	(revision 843054c23fcb725d2486e5e42e91b3741bc523b8)
+++ src/Tests/ResolvExpr/Cast.c	(revision cd623a4e93c2eeb566858071f03b3e141d60d50c)
@@ -1,11 +1,15 @@
 char f;
-void f()
-{
-  char f;
-  double f;
-  (int)f;
-  short f;
-  (int)f;
-  (void(*)())f;
-  ([long, long double, *[]()])([f, f, f]);
+
+void f() {
+	char f;
+	double f;
+	(int)f;
+	short f;
+	(int)f;
+	(void(*)())f;
+	([long, long double, *[]()])([f, f, f]);
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/ResolvExpr/CastError.c
===================================================================
--- src/Tests/ResolvExpr/CastError.c	(revision 843054c23fcb725d2486e5e42e91b3741bc523b8)
+++ src/Tests/ResolvExpr/CastError.c	(revision cd623a4e93c2eeb566858071f03b3e141d60d50c)
@@ -1,8 +1,12 @@
 int f;
-void f()
-{
-  int f;
-  double f;
-  (char)f;
-  (int(*)())f;
+
+void f() {
+	int f;
+	double f;
+	(char)f;
+	(int(*)())f;
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/ResolvExpr/Forall.c
===================================================================
--- src/Tests/ResolvExpr/Forall.c	(revision 843054c23fcb725d2486e5e42e91b3741bc523b8)
+++ src/Tests/ResolvExpr/Forall.c	(revision cd623a4e93c2eeb566858071f03b3e141d60d50c)
@@ -6,34 +6,36 @@
 void (* ?=?( void (**)(void), void (*)(void) ))(void);
 
-void g1()
-{
-  forall( type T ) T f( T );
-  void f( int );
-  void h( void (*p)(void) );
+void g1() {
+	forall( type T ) T f( T );
+	void f( int );
+	void h( void (*p)(void) );
   
-  int x;
-  void (*y)(void);
-  char z;
-  float w;
+	int x;
+	void (*y)(void);
+	char z;
+	float w;
   
-  f( x );
-  f( y );
-  f( z );
-  f( w );
-  h( f( y ) );
+	f( x );
+	f( y );
+	f( z );
+	f( w );
+	h( f( y ) );
 }
 
-void g2()
-{
-  forall( type T ) void f( T, T );
-  forall( type T, type U ) void f( T, U );
+void g2() {
+	forall( type T ) void f( T, T );
+	forall( type T, type U ) void f( T, U );
   
-  int x;
-  float y;
-  int *z;
-  float *w;
+	int x;
+	float y;
+	int *z;
+	float *w;
   
-  f( x, y );
-  f( z, w );
-  f( x, z );
+	f( x, y );
+	f( z, w );
+	f( x, z );
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/ResolvExpr/Function.c
===================================================================
--- src/Tests/ResolvExpr/Function.c	(revision 843054c23fcb725d2486e5e42e91b3741bc523b8)
+++ src/Tests/ResolvExpr/Function.c	(revision cd623a4e93c2eeb566858071f03b3e141d60d50c)
@@ -4,10 +4,8 @@
 float f( float );
 
-void g()
-{
-  // selects the same f and a each time
-  // but without a cast would be ambiguous
-  f( (int)a );
-  (int)f( a );
+void g() {
+	// selects the same f each time but without a cast would be ambiguous
+	f( (int)a );
+	(int)f( a );
 }
 
@@ -24,8 +22,11 @@
 [ int, int ] r( int, int, int, int );
 
-void s()
-{
-  r( p, q );
-  r( [ q, p ] );
-  r( r( p, q ), r( q, q ) );
+void s() {
+	r( p, q );
+	r( [ q, p ] );
+	r( r( p, q ), r( q, q ) );
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/ResolvExpr/InferParam.c
===================================================================
--- src/Tests/ResolvExpr/InferParam.c	(revision 843054c23fcb725d2486e5e42e91b3741bc523b8)
+++ src/Tests/ResolvExpr/InferParam.c	(revision cd623a4e93c2eeb566858071f03b3e141d60d50c)
@@ -8,14 +8,12 @@
 void i( float );
 
-void h()
-{
-  int a;
-  i( g( a ) );
+void h() {
+	int a;
+	i( g( a ) );
 }
 
-context has_f_and_j( type T, type U )
-{
-  U f( T );
-  U j( T, U );
+context has_f_and_j( type T, type U ) {
+	U f( T );
+	U j( T, U );
 };
 
@@ -23,7 +21,10 @@
 forall( type T, type U | has_f_and_j( T, U ) ) U k( T );
 
-void l()
-{
-  int b;
-  i( k( b ) );
+void l() {
+	int b;
+	i( k( b ) );
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/ResolvExpr/Members.c
===================================================================
--- src/Tests/ResolvExpr/Members.c	(revision 843054c23fcb725d2486e5e42e91b3741bc523b8)
+++ src/Tests/ResolvExpr/Members.c	(revision cd623a4e93c2eeb566858071f03b3e141d60d50c)
@@ -1,4 +1,2 @@
-// "../../cfa-cpp -nc Members.c"
-
 char ?=?( char*, char );
 int ?=?( int*, int );
@@ -13,53 +11,47 @@
 void d( float* );
 
-struct a_struct
-{
-  int a;
-  char a;
-  float a;
+struct a_struct {
+	int a;
+	char a;
+	float a;
 };
 
-union b_struct
-{
-  int *a;
-  char *a;
-  float *a;
+union b_struct {
+	int *a;
+	char *a;
+	float *a;
 };
 
-void f()
-{
-  struct a_struct the_struct;
-  union b_struct the_struct;
+void f() {
+	struct a_struct the_struct;
+	union b_struct the_struct;
   
-  a( the_struct.a );
-  b( the_struct.a );
-  c( the_struct.a );
-  d( the_struct.a );
+	a( the_struct.a );
+	b( the_struct.a );
+	c( the_struct.a );
+	d( the_struct.a );
 }
 
-struct c_struct
-{
-  int;
-  char;
-  float;
+struct c_struct {
+	int;
+	char;
+	float;
 };
 
-union d_struct
-{
-  int*;
-  char*;
-  float*;
+union d_struct {
+	int*;
+	char*;
+	float*;
 };
 
-void g()
-{
-  unsigned short x;
-  struct c_struct x;
-  union d_struct x;
+void g() {
+	unsigned short x;
+	struct c_struct x;
+	union d_struct x;
   
-  a( x );	// the 'a' and 'b' calls resolve to the ushort
-  b( x );	// it's debatable whether this is good
-  c( x );
-  d( x );
+	a( x );	// the 'a' and 'b' calls resolve to the ushort
+	b( x );	// it's debatable whether this is good
+	c( x );
+	d( x );
 }
 
@@ -72,6 +64,9 @@
 struct forward { int y; };
 
-void h()
-{
+void h() {
 	q->y;
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/ResolvExpr/Misc.c
===================================================================
--- src/Tests/ResolvExpr/Misc.c	(revision 843054c23fcb725d2486e5e42e91b3741bc523b8)
+++ src/Tests/ResolvExpr/Misc.c	(revision cd623a4e93c2eeb566858071f03b3e141d60d50c)
@@ -6,10 +6,12 @@
 void g( unsigned );
 
-void
-f( void )
-{
-  g( (a, b) );
-  g( (a, a, b) );
-  g( sizeof a );
-  g( sizeof( int ) );
+void f( void ) {
+	g( (a, b) );
+	g( (a, a, b) );
+	g( sizeof a );
+	g( sizeof( int ) );
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/ResolvExpr/MiscError.c
===================================================================
--- src/Tests/ResolvExpr/MiscError.c	(revision 843054c23fcb725d2486e5e42e91b3741bc523b8)
+++ src/Tests/ResolvExpr/MiscError.c	(revision cd623a4e93c2eeb566858071f03b3e141d60d50c)
@@ -5,10 +5,12 @@
 void g( int );
 
-void
-f( void )
-{
-  g( (b, a) );
-  g( (b, a, b) );
-  g( (a, b, b) );
-  sizeof b;
+void f( void ) {
+	g( (b, a) );
+	g( (b, a, b) );
+	g( (a, b, b) );
+	sizeof b;
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/ResolvExpr/OccursError.c
===================================================================
--- src/Tests/ResolvExpr/OccursError.c	(revision 843054c23fcb725d2486e5e42e91b3741bc523b8)
+++ src/Tests/ResolvExpr/OccursError.c	(revision cd623a4e93c2eeb566858071f03b3e141d60d50c)
@@ -1,11 +1,10 @@
-// "./cfa-cpp -c simple.c"
-// "./cfa -v simple.c"
-// "./cfa -CFA simple.c > simple_out.c"
-
 forall( type T ) void f( void (*)( T, T* ) );
 forall( type U ) void g( U*, U );
 
-void test()
-{
-  f( g );
+void test() {
+    f( g );
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/ResolvExpr/Operators.c
===================================================================
--- src/Tests/ResolvExpr/Operators.c	(revision 843054c23fcb725d2486e5e42e91b3741bc523b8)
+++ src/Tests/ResolvExpr/Operators.c	(revision cd623a4e93c2eeb566858071f03b3e141d60d50c)
@@ -1,28 +1,27 @@
 int ?*?( int, int );
 
-int
-?()( int number1, int number2 )
-{
-  return number1 * number2;
+int ?()( int number1, int number2 ) {
+	return number1 * number2;
 }
 
 int ?+?( int, int );
 
-int ?=?( int*, int );
-struct accumulator
-{
-  int total;
+int ?=?( int *, int );
+struct accumulator {
+	int total;
 };
 
 char ?()( struct accumulator a, char number1, char number2 );
 
-void
-f( void )
-{
-  char a, b;
-  ?()( a, b );
-  a(b);
-  a + b;
-  struct accumulator ?+?;	// why not, eh?
-  a + b;
+void f( void ) {
+	char a, b;
+	?()( a, b );
+	a(b);
+	a + b;
+	struct accumulator ?+?;	// why not, eh?
+	a + b;
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/ResolvExpr/Quad.c
===================================================================
--- src/Tests/ResolvExpr/Quad.c	(revision 843054c23fcb725d2486e5e42e91b3741bc523b8)
+++ src/Tests/ResolvExpr/Quad.c	(revision cd623a4e93c2eeb566858071f03b3e141d60d50c)
@@ -1,19 +1,20 @@
-int ?=?( int*, int );
+int ?=?( int *, int );
 int ?*?( int, int );
 
 forall( type T | { T ?*?( T, T ); } )
-T square( T t )
-{
-  return t * t;
+T square( T t ) {
+	return t * t;
 }
 
 forall( type U | { U square( U ); } )
-U quad( U u )
-{
-  return square( square( u ) );
+U quad( U u ) {
+	return square( square( u ) );
 }
 
-void f()
-{
-  quad( 7 );
+void f() {
+	quad( 7 );
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/ResolvExpr/Rank2.c
===================================================================
--- src/Tests/ResolvExpr/Rank2.c	(revision 843054c23fcb725d2486e5e42e91b3741bc523b8)
+++ src/Tests/ResolvExpr/Rank2.c	(revision cd623a4e93c2eeb566858071f03b3e141d60d50c)
@@ -1,18 +1,20 @@
-int ?=?( int*, int );
-forall(dtype DT) DT* 	   	?=?( DT *          *,            DT* );
+int ?=?( int *, int );
+forall(dtype DT) DT * ?=?( DT **, DT * );
 
-void a()
-{
-  forall( type T ) void f( T );
-  void g( forall( type U ) void p( U ) );
-  g( f );
+void a() {
+	forall( type T ) void f( T );
+	void g( forall( type U ) void p( U ) );
+	g( f );
 }
 
-void g()
-{
-  void h( int *null );
-  forall( type T ) T id( T );
-  forall( dtype T ) T *0;
-  int 0;
-  h( id( id( id( 0 ) ) ) );
+void g() {
+	void h( int *null );
+	forall( type T ) T id( T );
+	forall( dtype T ) T *0;
+	int 0;
+	h( id( id( id( 0 ) ) ) );
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/ResolvExpr/ShortCircuit.c
===================================================================
--- src/Tests/ResolvExpr/ShortCircuit.c	(revision 843054c23fcb725d2486e5e42e91b3741bc523b8)
+++ src/Tests/ResolvExpr/ShortCircuit.c	(revision cd623a4e93c2eeb566858071f03b3e141d60d50c)
@@ -6,10 +6,13 @@
 void g( int );
 
-void f( int a )
-{
-  int b;
-  float c;
-  g( a ? b : c );
-  g( a && c );
-  g( a || b );
+void f( int a ) {
+	int b;
+	float c;
+	g( a ? b : c );
+	g( a && c );
+	g( a || b );
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: src/Tests/ResolvExpr/Statement.c
===================================================================
--- src/Tests/ResolvExpr/Statement.c	(revision 843054c23fcb725d2486e5e42e91b3741bc523b8)
+++ src/Tests/ResolvExpr/Statement.c	(revision cd623a4e93c2eeb566858071f03b3e141d60d50c)
@@ -1,16 +1,19 @@
-int ?=?( int*, int );
+int ?=?( int *, int );
 int ?!=?( int, int );
 int 0;
 
-void f()
-{
+void f() {
     int a;
     struct { int b; } a;
     if ( a ) {
-      while ( a ) {
-        int *b;
-        for ( b; a; b ) {
-        }
-      }
+		while ( a ) {
+			int *b;
+			for ( b; a; b ) {
+			}
+		}
     }
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //