Index: translator/SynTree/AddressExpr.cc
===================================================================
--- translator/SynTree/AddressExpr.cc	(revision 4bf529812249ca5fe41f98e56debf210638aa7e9)
+++ translator/SynTree/AddressExpr.cc	(revision a32b204359041ff1f6ef505a929495bcfe7a54f3)
@@ -14,5 +14,5 @@
     : Expression( _aname ), arg( arg )
 {
-    for( std::list< Type* >::const_iterator i = arg->get_results().begin(); i != arg->get_results().end(); ++i ) {
+    for ( std::list< Type* >::const_iterator i = arg->get_results().begin(); i != arg->get_results().end(); ++i ) {
 	get_results().push_back( new PointerType( Type::Qualifiers(), (*i)->clone() ) );
     }
@@ -33,5 +33,5 @@
 {
     os << std::string( indent, ' ' ) << "Address of:" << std::endl;
-    if( arg ) {
+    if ( arg ) {
 	arg->print( os, indent+2 );
     }
Index: translator/SynTree/AggregateDecl.cc
===================================================================
--- translator/SynTree/AggregateDecl.cc	(revision 4bf529812249ca5fe41f98e56debf210638aa7e9)
+++ translator/SynTree/AggregateDecl.cc	(revision a32b204359041ff1f6ef505a929495bcfe7a54f3)
@@ -36,9 +36,9 @@
 
     os << typeString() << " " << get_name();
-    if( !parameters.empty() ) {
+    if ( ! parameters.empty() ) {
 	os << endl << string( indent+2, ' ' ) << "with parameters" << endl;
 	printAll( parameters, os, indent+4 );
     }
-    if( !members.empty() ) {
+    if ( ! members.empty() ) {
 	os << endl << string( indent+2, ' ' ) << "with members" << endl;
 	printAll( members, os, indent+4 );
@@ -53,5 +53,5 @@
 
     os << typeString() << " " << get_name();
-    if( !parameters.empty() ) {
+    if ( ! parameters.empty() ) {
 	os << endl << string( indent+2, ' ' ) << "with parameters" << endl;
 	printAll( parameters, os, indent+4 );
Index: translator/SynTree/ApplicationExpr.cc
===================================================================
--- translator/SynTree/ApplicationExpr.cc	(revision 4bf529812249ca5fe41f98e56debf210638aa7e9)
+++ translator/SynTree/ApplicationExpr.cc	(revision a32b204359041ff1f6ef505a929495bcfe7a54f3)
@@ -16,5 +16,5 @@
 ParamEntry::operator=( const ParamEntry &other )
 {
-    if( &other == this ) return *this;
+    if ( &other == this ) return *this;
     decl = other.decl;
     actualType = maybeClone( other.actualType );
@@ -39,5 +39,5 @@
     assert( function );
     
-    for( std::list< DeclarationWithType* >::const_iterator i = function->get_returnVals().begin(); i != function->get_returnVals().end(); ++i ) {
+    for ( std::list< DeclarationWithType* >::const_iterator i = function->get_returnVals().begin(); i != function->get_returnVals().end(); ++i ) {
 	get_results().push_back( (*i)->get_type()->clone() );
     }
@@ -61,11 +61,11 @@
     os << std::string( indent, ' ' ) << "Application of" << std::endl;
     function->print( os, indent+2 );
-    if( !args.empty() ) {
+    if ( ! args.empty() ) {
 	os << std::string( indent, ' ' ) << "to arguments" << std::endl;
 	printAll( args, os, indent+2 );
     }
-    if( !inferParams.empty() ) {
+    if ( ! inferParams.empty() ) {
 	os << std::string(indent, ' ') << "with inferred parameters:" << std::endl;
-	for( InferredParams::const_iterator i = inferParams.begin(); i != inferParams.end(); ++i ) {
+	for ( InferredParams::const_iterator i = inferParams.begin(); i != inferParams.end(); ++i ) {
 	    os << std::string(indent+2, ' ');
 	    Declaration::declFromId( i->second.decl )->printShort( os, indent+2 );
Index: translator/SynTree/ArrayType.cc
===================================================================
--- translator/SynTree/ArrayType.cc	(revision 4bf529812249ca5fe41f98e56debf210638aa7e9)
+++ translator/SynTree/ArrayType.cc	(revision a32b204359041ff1f6ef505a929495bcfe7a54f3)
@@ -33,10 +33,10 @@
 {
     Type::print( os, indent );
-    if( isStatic ) {
+    if ( isStatic ) {
 	os << "static ";
     }
-    if( isVarLen ) {
+    if ( isVarLen ) {
 	os << "variable length array of ";
-    } else if( dimension ) {
+    } else if ( dimension ) {
 	os << "array of ";
 	dimension->print( os, indent );
@@ -44,5 +44,5 @@
 	os << "open array of ";
     }
-    if( base ) {
+    if ( base ) {
 	base->print( os, indent );
     }
Index: translator/SynTree/AttrType.cc
===================================================================
--- translator/SynTree/AttrType.cc	(revision 4bf529812249ca5fe41f98e56debf210638aa7e9)
+++ translator/SynTree/AttrType.cc	(revision a32b204359041ff1f6ef505a929495bcfe7a54f3)
@@ -37,9 +37,9 @@
     Type::print( os, indent );
     os << "attribute " << name << " applied to ";
-    if( expr ) {
+    if ( expr ) {
 	os << "expression ";
 	expr->print( os, indent );
     }
-    if( type ) {
+    if ( type ) {
 	os << "type ";
 	type->print( os, indent );
Index: translator/SynTree/BasicType.cc
===================================================================
--- translator/SynTree/BasicType.cc	(revision 4bf529812249ca5fe41f98e56debf210638aa7e9)
+++ translator/SynTree/BasicType.cc	(revision a32b204359041ff1f6ef505a929495bcfe7a54f3)
@@ -19,5 +19,5 @@
 
 bool BasicType::isInteger() const {
-    switch( kind ) {
+    switch ( kind ) {
       case Bool:
       case Char:
Index: translator/SynTree/CodeGenVisitor.cc
===================================================================
--- translator/SynTree/CodeGenVisitor.cc	(revision 4bf529812249ca5fe41f98e56debf210638aa7e9)
+++ translator/SynTree/CodeGenVisitor.cc	(revision a32b204359041ff1f6ef505a929495bcfe7a54f3)
@@ -20,5 +20,5 @@
 
 void CodeGenVisitor::visit(ConstantExpr *cnst){
-    if(cnst != 0)
+    if (cnst != 0)
 	visit(cnst->get_constant());
 }
@@ -28,10 +28,10 @@
 
 void CodeGenVisitor::visit(ExprStmt *exprStmt){
-    if(exprStmt != 0)
+    if (exprStmt != 0)
 	exprStmt->get_expr()->accept(*this);	// visit(exprStmt->get_expr()) doesn't work
 }
 
 void CodeGenVisitor::visit(SwitchStmt *switchStmt){
-    cout << "switch(" << endl;	    
+    cout << "switch (" << endl;	    
     // visit(switchStmt->get_condition());   // why doesn't this work?
     switchStmt->get_condition()->accept(*this);
Index: translator/SynTree/Constant.cc
===================================================================
--- translator/SynTree/Constant.cc	(revision 4bf529812249ca5fe41f98e56debf210638aa7e9)
+++ translator/SynTree/Constant.cc	(revision a32b204359041ff1f6ef505a929495bcfe7a54f3)
@@ -15,5 +15,5 @@
 void Constant::print( std::ostream &os ) const {
     os << value;
-    if( type ) {
+    if ( type ) {
 	os << " (type: ";
 	type->print( os );
Index: translator/SynTree/DeclStmt.cc
===================================================================
--- translator/SynTree/DeclStmt.cc	(revision 4bf529812249ca5fe41f98e56debf210638aa7e9)
+++ translator/SynTree/DeclStmt.cc	(revision a32b204359041ff1f6ef505a929495bcfe7a54f3)
@@ -30,5 +30,5 @@
 {
     os << "Declaration of ";
-    if( decl ) {
+    if ( decl ) {
 	decl->print( os, indent );
     }
Index: translator/SynTree/Declaration.cc
===================================================================
--- translator/SynTree/Declaration.cc	(revision 4bf529812249ca5fe41f98e56debf210638aa7e9)
+++ translator/SynTree/Declaration.cc	(revision a32b204359041ff1f6ef505a929495bcfe7a54f3)
@@ -47,5 +47,5 @@
 {
     IdMapType::const_iterator i = idMap.find( id );
-    if( i != idMap.end() ) {
+    if ( i != idMap.end() ) {
 	return i->second;
     } else {
@@ -58,5 +58,5 @@
 Declaration::dumpIds( std::ostream &os )
 {
-    for( IdMapType::const_iterator i = idMap.begin(); i != idMap.end(); ++i ) {
+    for ( IdMapType::const_iterator i = idMap.begin(); i != idMap.end(); ++i ) {
 	os << i->first << " -> ";
 	i->second->printShort( os );
Index: translator/SynTree/Expression.cc
===================================================================
--- translator/SynTree/Expression.cc	(revision 4bf529812249ca5fe41f98e56debf210638aa7e9)
+++ translator/SynTree/Expression.cc	(revision a32b204359041ff1f6ef505a929495bcfe7a54f3)
@@ -32,5 +32,5 @@
 Expression::add_result( Type *t )
 {
-    if( TupleType *tuple = dynamic_cast< TupleType* >( t ) ) {
+    if ( TupleType *tuple = dynamic_cast< TupleType* >( t ) ) {
 	std::copy( tuple->get_types().begin(), tuple->get_types().end(), back_inserter( results ) );
     } else {
@@ -40,10 +40,10 @@
 
 void Expression::print(std::ostream &os, int indent) const {
-    if( env ) {
+    if ( env ) {
 	os << std::string(indent, ' ') << "with environment:" << std::endl;
 	env->print( os, indent+2 );
     }
 
-    if( argName ) {
+    if ( argName ) {
 	os << std::string(indent, ' ') << "with designator:";
 	argName->print( os, indent+2 );
@@ -75,5 +75,5 @@
 {
     add_result( var->get_type()->clone() );
-    for( std::list< Type* >::iterator i = get_results().begin(); i != get_results().end(); ++i ) {
+    for ( std::list< Type* >::iterator i = get_results().begin(); i != get_results().end(); ++i ) {
 	(*i)->set_isLvalue( true );
     }
@@ -94,6 +94,6 @@
 
     Declaration *decl = get_var();
-    // if( decl != 0) decl->print(os, indent + 2);
-    if( decl != 0) decl->printShort(os, indent + 2);
+    // if ( decl != 0) decl->print(os, indent + 2);
+    if ( decl != 0) decl->printShort(os, indent + 2);
     os << std::endl;
     Expression::print( os, indent );
@@ -126,5 +126,5 @@
     os << std::string(indent, ' ') << "Sizeof Expression on: ";
 
-    if(isType)
+    if (isType)
 	type->print(os, indent + 2);
     else
@@ -160,8 +160,8 @@
     os << std::string(indent, ' ') << "Attr ";
     attr->print( os, indent + 2 );
-    if( isType || expr ) {
+    if ( isType || expr ) {
 	os << "applied to: ";
 
-	if(isType)
+	if (isType)
 	    type->print(os, indent + 2);
 	else
@@ -197,5 +197,5 @@
     arg->print(os, indent+2);
     os << std::endl << std::string(indent, ' ') << "to:" << std::endl;
-    if( results.empty() ) {
+    if ( results.empty() ) {
 	os << std::string(indent+2, ' ') << "nothing" << std::endl;
     } else {
@@ -233,5 +233,5 @@
 {
     add_result( member->get_type()->clone() );
-    for( std::list< Type* >::iterator i = get_results().begin(); i != get_results().end(); ++i ) {
+    for ( std::list< Type* >::iterator i = get_results().begin(); i != get_results().end(); ++i ) {
 	(*i)->set_isLvalue( true );
     }
@@ -287,5 +287,5 @@
 void UntypedExpr::printArgs(std::ostream &os, int indent ) const {
     std::list<Expression *>::const_iterator i;
-    for(i = args.begin(); i != args.end(); i++)
+    for (i = args.begin(); i != args.end(); i++)
 	(*i)->print(os, indent);
 }
@@ -362,5 +362,5 @@
 {
     os << std::string(indent, ' ') << "Valof Expression: " << std::endl;
-    if( get_body() != 0 )
+    if ( get_body() != 0 )
 	get_body()->print( os, indent + 2 );
 }
Index: translator/SynTree/FunctionDecl.cc
===================================================================
--- translator/SynTree/FunctionDecl.cc	(revision 4bf529812249ca5fe41f98e56debf210638aa7e9)
+++ translator/SynTree/FunctionDecl.cc	(revision a32b204359041ff1f6ef505a929495bcfe7a54f3)
@@ -56,5 +56,5 @@
     if ( ! oldIdents.empty() ) {
 	os << string( indent+2, ' ' ) << "with parameter names" << endl;
-	for( std::list< std::string >::const_iterator i = oldIdents.begin(); i != oldIdents.end(); ++i ) {
+	for ( std::list< std::string >::const_iterator i = oldIdents.begin(); i != oldIdents.end(); ++i ) {
 	    os << string( indent+4, ' ' ) << *i << endl;
 	}
Index: translator/SynTree/Initializer.cc
===================================================================
--- translator/SynTree/Initializer.cc	(revision 4bf529812249ca5fe41f98e56debf210638aa7e9)
+++ translator/SynTree/Initializer.cc	(revision a32b204359041ff1f6ef505a929495bcfe7a54f3)
@@ -61,5 +61,5 @@
     }
 
-    for( std::list<Initializer *>::iterator i = initializers.begin(); i != initializers.end(); i++ ) 
+    for ( std::list<Initializer *>::iterator i = initializers.begin(); i != initializers.end(); i++ ) 
 	(*i)->print( os, indent + 2 );
 }
Index: translator/SynTree/Mutator.h
===================================================================
--- translator/SynTree/Mutator.h	(revision 4bf529812249ca5fe41f98e56debf210638aa7e9)
+++ translator/SynTree/Mutator.h	(revision a32b204359041ff1f6ef505a929495bcfe7a54f3)
@@ -110,5 +110,5 @@
 	}
     }
-    if ( !errors.isEmpty() ) {
+    if ( ! errors.isEmpty() ) {
 	throw errors;
     }
Index: translator/SynTree/NamedTypeDecl.cc
===================================================================
--- translator/SynTree/NamedTypeDecl.cc	(revision 4bf529812249ca5fe41f98e56debf210638aa7e9)
+++ translator/SynTree/NamedTypeDecl.cc	(revision a32b204359041ff1f6ef505a929495bcfe7a54f3)
@@ -35,9 +35,9 @@
 	base->print( os, indent );
     } // if
-    if ( !parameters.empty() ) {
+    if ( ! parameters.empty() ) {
 	os << endl << string( indent, ' ' ) << "with parameters" << endl;
 	printAll( parameters, os, indent+2 );
     } // if
-    if ( !assertions.empty() ) {
+    if ( ! assertions.empty() ) {
 	os << endl << string( indent, ' ' ) << "with assertions" << endl;
 	printAll( assertions, os, indent+2 );
@@ -59,5 +59,5 @@
 	base->print( os, indent );
     } // if
-    if ( !parameters.empty() ) {
+    if ( ! parameters.empty() ) {
 	os << endl << string( indent, ' ' ) << "with parameters" << endl;
 	printAll( parameters, os, indent+2 );
Index: translator/SynTree/PointerType.cc
===================================================================
--- translator/SynTree/PointerType.cc	(revision 4bf529812249ca5fe41f98e56debf210638aa7e9)
+++ translator/SynTree/PointerType.cc	(revision a32b204359041ff1f6ef505a929495bcfe7a54f3)
@@ -40,14 +40,14 @@
     Type::print( os, indent );
     os << "pointer to ";
-    if( isStatic ) {
+    if ( isStatic ) {
 	os << "static ";
     }
-    if( isVarLen ) {
+    if ( isVarLen ) {
 	os << "variable length array of ";
-    } else if( dimension ) {
+    } else if ( dimension ) {
 	os << "array of ";
 	dimension->print( os, indent );
     }
-    if( base ) {
+    if ( base ) {
 	base->print( os, indent );
     }
Index: translator/SynTree/ReferenceToType.cc
===================================================================
--- translator/SynTree/ReferenceToType.cc	(revision 4bf529812249ca5fe41f98e56debf210638aa7e9)
+++ translator/SynTree/ReferenceToType.cc	(revision a32b204359041ff1f6ef505a929495bcfe7a54f3)
@@ -39,5 +39,5 @@
     Type::print( os, indent );
     os << "instance of " << typeString() << " " << name << " ";
-    if( !parameters.empty() ) {
+    if ( ! parameters.empty() ) {
 	os << endl << std::string( indent, ' ' ) << "with parameters" << endl;
 	printAll( parameters, os, indent+2 );
@@ -51,6 +51,6 @@
 {
     std::list< Declaration* > found;
-    for( std::list< Declaration* >::const_iterator i = members.begin(); i != members.end(); ++i ) {
-	if( (*i)->get_name() == name ) {
+    for ( std::list< Declaration* >::const_iterator i = members.begin(); i != members.end(); ++i ) {
+	if ( (*i)->get_name() == name ) {
 	    found.push_back( *i );
 	}
@@ -118,5 +118,5 @@
     Type::print( os, indent );
     os << "instance of " << typeString() << " " << get_name() << " (" << ( isFtype ? "" : "not" ) << " a function type) ";
-    if( !parameters.empty() ) {
+    if ( ! parameters.empty() ) {
 	os << endl << std::string( indent, ' ' ) << "with parameters" << endl;
 	printAll( parameters, os, indent+2 );
Index: translator/SynTree/Statement.cc
===================================================================
--- translator/SynTree/Statement.cc	(revision 4bf529812249ca5fe41f98e56debf210638aa7e9)
+++ translator/SynTree/Statement.cc	(revision a32b204359041ff1f6ef505a929495bcfe7a54f3)
@@ -38,5 +38,5 @@
 {
     //actually this is a syntactic error signaled by the parser
-    if(type == BranchStmt::Goto && target.size() == 0)
+    if (type == BranchStmt::Goto && target.size() == 0)
 	throw SemanticError("goto without target");
 }
@@ -46,5 +46,5 @@
     Statement(labels), computedTarget(_computedTarget), type(_type)
 {
-    if(type != BranchStmt::Goto || computedTarget == 0)
+    if (type != BranchStmt::Goto || computedTarget == 0)
 	throw SemanticError("Computed target not valid in branch statement");
 }
@@ -63,5 +63,5 @@
 void ReturnStmt::print( std::ostream &os, int indent ){
     os << "\r" << std::string(indent, ' ') << string ( isThrow? "Throw":"Return" ) << " Statement, returning: ";
-    if(expr != 0) expr->print(os);
+    if (expr != 0) expr->print(os);
     os << endl;
 }
@@ -81,5 +81,5 @@
     thenPart->print(os, indent + 4);
 
-    if(elsePart != 0){
+    if (elsePart != 0){
 	elsePart->print(os, indent + 4);
     }
@@ -104,5 +104,5 @@
     // branches
     std::list<Statement *>::iterator i;
-    for(i = branches.begin(); i != branches.end(); i++)
+    for (i = branches.begin(); i != branches.end(); i++)
 	(*i)->print(os, indent + 4);
 
@@ -115,5 +115,5 @@
     Statement(_labels), condition(_condition), stmts(_statements), _isDefault(deflt)
 {
-    if(isDefault() && condition != 0)
+    if (isDefault() && condition != 0)
 	throw SemanticError("default with conditions");
 }
@@ -126,5 +126,5 @@
     os << "\r" << string(indent, ' ');
 
-    if(isDefault())
+    if (isDefault())
 	os << "Default ";
     else {
@@ -136,5 +136,5 @@
 
     std::list<Statement *>::iterator i;
-    for(i = stmts.begin(); i != stmts.end(); i++)
+    for (i = stmts.begin(); i != stmts.end(); i++)
 	(*i)->print(os, indent + 4);
 }
@@ -158,5 +158,5 @@
     // branches
     std::list<Statement *>::iterator i;
-    for(i = branches.begin(); i != branches.end(); i++)
+    for (i = branches.begin(); i != branches.end(); i++)
 	(*i)->print(os, indent + 4);
 
@@ -183,5 +183,5 @@
     os << string(indent, ' ') << ".... with body: " << endl;
 
-    if(body != 0) body->print(os, indent + 4);
+    if (body != 0) body->print(os, indent + 4);
 }
 
@@ -216,5 +216,5 @@
 
     os << "\n\r" << string(indent + 2, ' ') << "statement block: \n"; 
-    if(body != 0)
+    if (body != 0)
 	body->print(os, indent + 4);
 
@@ -244,5 +244,5 @@
     os << string(indent + 2, ' ') << "and handlers: " << endl;
     std::list<Statement *>::iterator i;
-    for(i = handlers.begin(); i != handlers.end(); i++)
+    for (i = handlers.begin(); i != handlers.end(); i++)
 	(*i)->print(os, indent + 4);
 
@@ -267,5 +267,5 @@
 
     os << "\r" << string(indent, ' ') << "... catching" << endl;
-    if( decl ) {
+    if ( decl ) {
 	decl->printShort( os, indent + 4 );
 	os << endl;
Index: translator/SynTree/Type.cc
===================================================================
--- translator/SynTree/Type.cc	(revision 4bf529812249ca5fe41f98e56debf210638aa7e9)
+++ translator/SynTree/Type.cc	(revision a32b204359041ff1f6ef505a929495bcfe7a54f3)
@@ -40,5 +40,5 @@
 
 void Type::print( std::ostream &os, int indent ) const {
-    if ( !forall.empty() ) {
+    if ( ! forall.empty() ) {
 	os << "forall" << std::endl;
 	printAll( forall, os, indent + 4 );
Index: translator/SynTree/TypeExpr.cc
===================================================================
--- translator/SynTree/TypeExpr.cc	(revision 4bf529812249ca5fe41f98e56debf210638aa7e9)
+++ translator/SynTree/TypeExpr.cc	(revision a32b204359041ff1f6ef505a929495bcfe7a54f3)
@@ -29,5 +29,5 @@
 TypeExpr::print( std::ostream &os, int indent ) const
 {
-    if( type ) type->print( os, indent );
+    if ( type ) type->print( os, indent );
     Expression::print( os, indent );
 }
Index: translator/SynTree/TypeSubstitution.cc
===================================================================
--- translator/SynTree/TypeSubstitution.cc	(revision 4bf529812249ca5fe41f98e56debf210638aa7e9)
+++ translator/SynTree/TypeSubstitution.cc	(revision a32b204359041ff1f6ef505a929495bcfe7a54f3)
@@ -21,8 +21,8 @@
 TypeSubstitution::~TypeSubstitution()
 {
-    for( TypeEnvType::iterator i = typeEnv.begin(); i != typeEnv.end(); ++i ) {
+    for ( TypeEnvType::iterator i = typeEnv.begin(); i != typeEnv.end(); ++i ) {
 	delete( i->second );
     }
-    for( VarEnvType::iterator i = varEnv.begin(); i != varEnv.end(); ++i ) {
+    for ( VarEnvType::iterator i = varEnv.begin(); i != varEnv.end(); ++i ) {
 	delete( i->second );
     }
@@ -32,5 +32,5 @@
 TypeSubstitution::operator=( const TypeSubstitution &other )
 {
-    if( this == &other ) return *this;
+    if ( this == &other ) return *this;
     initialize( other, *this );
     return *this;
@@ -48,8 +48,8 @@
 TypeSubstitution::add( const TypeSubstitution &other )
 {
-    for( TypeEnvType::const_iterator i = other.typeEnv.begin(); i != other.typeEnv.end(); ++i ) {
+    for ( TypeEnvType::const_iterator i = other.typeEnv.begin(); i != other.typeEnv.end(); ++i ) {
 	typeEnv[ i->first ] = i->second->clone();
     }
-    for( VarEnvType::const_iterator i = other.varEnv.begin(); i != other.varEnv.end(); ++i ) {
+    for ( VarEnvType::const_iterator i = other.varEnv.begin(); i != other.varEnv.end(); ++i ) {
 	varEnv[ i->first ] = i->second->clone();
     }
@@ -60,5 +60,5 @@
 {
     TypeEnvType::iterator i = typeEnv.find( formalType );
-    if( i != typeEnv.end() ) {
+    if ( i != typeEnv.end() ) {
 	delete i->second;
     }
@@ -70,5 +70,5 @@
 {
     TypeEnvType::iterator i = typeEnv.find( formalType );
-    if( i != typeEnv.end() ) {
+    if ( i != typeEnv.end() ) {
 	delete i->second;
 	typeEnv.erase( formalType );
@@ -80,5 +80,5 @@
 {
     TypeEnvType::const_iterator i = typeEnv.find( formalType );
-    if( i == typeEnv.end() ) {
+    if ( i == typeEnv.end() ) {
 	return 0;
     } else {
@@ -99,8 +99,8 @@
 	subCount = 0;
 	freeOnly = true;
-	for( TypeEnvType::iterator i = typeEnv.begin(); i != typeEnv.end(); ++i ) {
+	for ( TypeEnvType::iterator i = typeEnv.begin(); i != typeEnv.end(); ++i ) {
 	    i->second = i->second->acceptMutator( *this );
 	}
-    } while( subCount );
+    } while ( subCount );
 }
 
@@ -109,8 +109,8 @@
 {
     BoundVarsType::const_iterator bound = boundVars.find( inst->get_name() );
-    if( bound != boundVars.end() ) return inst;
+    if ( bound != boundVars.end() ) return inst;
     
     TypeEnvType::const_iterator i = typeEnv.find( inst->get_name() );
-    if( i == typeEnv.end() ) {
+    if ( i == typeEnv.end() ) {
 	return inst;
     } else {
@@ -130,5 +130,5 @@
 {
     VarEnvType::const_iterator i = varEnv.find( nameExpr->get_name() );
-    if( i == varEnv.end() ) {
+    if ( i == varEnv.end() ) {
 	return nameExpr;
     } else {
@@ -144,6 +144,6 @@
 {
     BoundVarsType oldBoundVars( boundVars );
-    if( freeOnly ) {
-	for( std::list< TypeDecl* >::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) {
+    if ( freeOnly ) {
+	for ( std::list< TypeDecl* >::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) {
 	    boundVars.insert( (*tyvar)->get_name() );
 	}
@@ -218,5 +218,5 @@
 {
     os << std::string( indent, ' ' ) << "Types:" << std::endl;
-    for( TypeEnvType::const_iterator i = typeEnv.begin(); i != typeEnv.end(); ++i ) {
+    for ( TypeEnvType::const_iterator i = typeEnv.begin(); i != typeEnv.end(); ++i ) {
 	os << std::string( indent+2, ' ' ) << i->first << " -> ";
 	i->second->print( os, indent+4 );
@@ -224,5 +224,5 @@
     }
     os << std::string( indent, ' ' ) << "Non-types:" << std::endl;
-    for( VarEnvType::const_iterator i = varEnv.begin(); i != varEnv.end(); ++i ) {
+    for ( VarEnvType::const_iterator i = varEnv.begin(); i != varEnv.end(); ++i ) {
 	os << std::string( indent+2, ' ' ) << i->first << " -> ";
 	i->second->print( os, indent+4 );
Index: translator/SynTree/TypeSubstitution.h
===================================================================
--- translator/SynTree/TypeSubstitution.h	(revision 4bf529812249ca5fe41f98e56debf210638aa7e9)
+++ translator/SynTree/TypeSubstitution.h	(revision a32b204359041ff1f6ef505a929495bcfe7a54f3)
@@ -90,10 +90,10 @@
     FormalIterator formalIt = formalBegin;
     ActualIterator actualIt = actualBegin;
-    for( ; formalIt != formalEnd; ++formalIt, ++actualIt ) {
-	if( TypeDecl *formal = dynamic_cast< TypeDecl* >( *formalIt ) ) {
-	    if( TypeExpr *actual = dynamic_cast< TypeExpr* >( *actualIt ) ) {
-		if( formal->get_name() != "" ) {
+    for ( ; formalIt != formalEnd; ++formalIt, ++actualIt ) {
+	if ( TypeDecl *formal = dynamic_cast< TypeDecl* >( *formalIt ) ) {
+	    if ( TypeExpr *actual = dynamic_cast< TypeExpr* >( *actualIt ) ) {
+		if ( formal->get_name() != "" ) {
 		    TypeEnvType::iterator i = typeEnv.find( formal->get_name() );
-		    if( i != typeEnv.end() ) {
+		    if ( i != typeEnv.end() ) {
 			delete i->second;
 		    }
@@ -105,5 +105,5 @@
 	} else {
 	    // TODO: type check the formal and actual parameters
-	    if( (*formalIt)->get_name() != "" ) {
+	    if ( (*formalIt)->get_name() != "" ) {
 		varEnv[ (*formalIt)->get_name() ] = (*actualIt)->clone();
 	    }
@@ -152,7 +152,7 @@
 TypeSubstitution::extract( TypeInstListIterator begin, TypeInstListIterator end, TypeSubstitution &result )
 {
-    while( begin != end ) {
+    while ( begin != end ) {
 	TypeEnvType::iterator cur = typeEnv.find( (*begin++)->get_name() );
-	if( cur != typeEnv.end() ) {
+	if ( cur != typeEnv.end() ) {
 	    result.typeEnv[ cur->first ] = cur->second;
 	    typeEnv.erase( cur );
@@ -170,5 +170,5 @@
 
     TypeSubstitution sub = TypeSubstitution( formalBegin, formalEnd, actual );
-    for( std::list< Declaration* >::iterator i = memberBegin; i != memberEnd; ++i ) {
+    for ( std::list< Declaration* >::iterator i = memberBegin; i != memberEnd; ++i ) {
 	Declaration *newdecl = (*i)->clone();
 	sub.apply( newdecl );
Index: translator/SynTree/TypeofType.cc
===================================================================
--- translator/SynTree/TypeofType.cc	(revision 4bf529812249ca5fe41f98e56debf210638aa7e9)
+++ translator/SynTree/TypeofType.cc	(revision a32b204359041ff1f6ef505a929495bcfe7a54f3)
@@ -31,5 +31,5 @@
     Type::print( os, indent );
     os << "type-of expression ";
-    if( expr ) {
+    if ( expr ) {
 	expr->print( os, indent );
     }
Index: translator/SynTree/Visitor.h
===================================================================
--- translator/SynTree/Visitor.h	(revision 4bf529812249ca5fe41f98e56debf210638aa7e9)
+++ translator/SynTree/Visitor.h	(revision a32b204359041ff1f6ef505a929495bcfe7a54f3)
@@ -103,5 +103,5 @@
 	}
     }
-    if ( !errors.isEmpty() ) {
+    if ( ! errors.isEmpty() ) {
 	throw errors;
     }
@@ -129,5 +129,5 @@
 	}
     }
-    if ( !errors.isEmpty() ) {
+    if ( ! errors.isEmpty() ) {
 	throw errors;
     }