Index: src/SymTab/Indexer.h
===================================================================
--- src/SymTab/Indexer.h	(revision 51fcaf8df28d845472ddec8c08cdb4b238f2aa9c)
+++ src/SymTab/Indexer.h	(revision 1e1e15b0a9bff1f799aa31c369722802cfb1792b)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Indexer.h -- 
+// Indexer.h --
 //
 // Author           : Richard C. Bilson
@@ -33,5 +33,5 @@
 		Indexer& operator= ( Indexer &&that );
 
-		//using Visitor::visit;
+		using Visitor::visit;
 		virtual void visit( ObjectDecl *objectDecl );
 		virtual void visit( FunctionDecl *functionDecl );
@@ -54,5 +54,5 @@
 		virtual void visit( MemberExpr *memberExpr );
 		virtual void visit( VariableExpr *variableExpr );
-		virtual void visit( ConstantExpr *constantExpr ); 
+		virtual void visit( ConstantExpr *constantExpr );
 		virtual void visit( SizeofExpr *sizeofExpr );
 		virtual void visit( AlignofExpr *alignofExpr );
@@ -93,5 +93,5 @@
 		/// Gets the top-most trait declaration with the given ID
 		TraitDecl *lookupTrait( const std::string &id ) const;
-  
+
 		void print( std::ostream &os, int indent = 0 ) const;
 	  private:
@@ -106,5 +106,5 @@
 		UnionDecl *lookupUnionAtScope( const std::string &id, unsigned long scope ) const;
 		TraitDecl *lookupTraitAtScope( const std::string &id, unsigned long scope ) const;
-		
+
 		void addId( DeclarationWithType *decl );
 		void addType( NamedTypeDecl *decl );
@@ -115,5 +115,5 @@
 		void addUnion( UnionDecl *decl );
 		void addTrait( TraitDecl *decl );
-		
+
 		struct Impl;
 		Impl *tables;         ///< Copy-on-write instance of table data structure
Index: src/SynTree/Visitor.cc
===================================================================
--- src/SynTree/Visitor.cc	(revision 51fcaf8df28d845472ddec8c08cdb4b238f2aa9c)
+++ src/SynTree/Visitor.cc	(revision 1e1e15b0a9bff1f799aa31c369722802cfb1792b)
@@ -39,5 +39,5 @@
 }
 
-void Visitor::visit( AggregateDecl *aggregateDecl ) {
+void Visitor::handleAggregateDecl( AggregateDecl *aggregateDecl ) {
 	acceptAll( aggregateDecl->get_parameters(), *this );
 	acceptAll( aggregateDecl->get_members(), *this );
@@ -45,20 +45,20 @@
 
 void Visitor::visit( StructDecl *aggregateDecl ) {
-	visit( static_cast< AggregateDecl* >( aggregateDecl ) );
+	handleAggregateDecl( static_cast< AggregateDecl* >( aggregateDecl ) );
 }
 
 void Visitor::visit( UnionDecl *aggregateDecl ) {
-	visit( static_cast< AggregateDecl* >( aggregateDecl ) );
+	handleAggregateDecl( static_cast< AggregateDecl* >( aggregateDecl ) );
 }
 
 void Visitor::visit( EnumDecl *aggregateDecl ) {
-	visit( static_cast< AggregateDecl* >( aggregateDecl ) );
+	handleAggregateDecl( static_cast< AggregateDecl* >( aggregateDecl ) );
 }
 
 void Visitor::visit( TraitDecl *aggregateDecl ) {
-	visit( static_cast< AggregateDecl* >( aggregateDecl ) );
-}
-
-void Visitor::visit( NamedTypeDecl *typeDecl ) {
+	handleAggregateDecl( static_cast< AggregateDecl* >( aggregateDecl ) );
+}
+
+void Visitor::handleNamedTypeDecl( NamedTypeDecl *typeDecl ) {
 	acceptAll( typeDecl->get_parameters(), *this );
 	acceptAll( typeDecl->get_assertions(), *this );
@@ -67,9 +67,9 @@
 
 void Visitor::visit( TypeDecl *typeDecl ) {
-	visit( static_cast< NamedTypeDecl* >( typeDecl ) );
+	handleNamedTypeDecl( static_cast< NamedTypeDecl* >( typeDecl ) );
 }
 
 void Visitor::visit( TypedefDecl *typeDecl ) {
-	visit( static_cast< NamedTypeDecl* >( typeDecl ) );
+	handleNamedTypeDecl( static_cast< NamedTypeDecl* >( typeDecl ) );
 }
 
@@ -330,5 +330,5 @@
 }
 
-void Visitor::visit( ReferenceToType *aggregateUseType ) {
+void Visitor::handleReferenceToType( ReferenceToType *aggregateUseType ) {
 	acceptAll( aggregateUseType->get_forall(), *this );
 	acceptAll( aggregateUseType->get_parameters(), *this );
@@ -336,22 +336,22 @@
 
 void Visitor::visit( StructInstType *aggregateUseType ) {
-	visit( static_cast< ReferenceToType * >( aggregateUseType ) );
+	handleReferenceToType( static_cast< ReferenceToType * >( aggregateUseType ) );
 }
 
 void Visitor::visit( UnionInstType *aggregateUseType ) {
-	visit( static_cast< ReferenceToType * >( aggregateUseType ) );
+	handleReferenceToType( static_cast< ReferenceToType * >( aggregateUseType ) );
 }
 
 void Visitor::visit( EnumInstType *aggregateUseType ) {
-	visit( static_cast< ReferenceToType * >( aggregateUseType ) );
+	handleReferenceToType( static_cast< ReferenceToType * >( aggregateUseType ) );
 }
 
 void Visitor::visit( TraitInstType *aggregateUseType ) {
-	visit( static_cast< ReferenceToType * >( aggregateUseType ) );
+	handleReferenceToType( static_cast< ReferenceToType * >( aggregateUseType ) );
 	acceptAll( aggregateUseType->get_members(), *this );
 }
 
 void Visitor::visit( TypeInstType *aggregateUseType ) {
-	visit( static_cast< ReferenceToType * >( aggregateUseType ) );
+	handleReferenceToType( static_cast< ReferenceToType * >( aggregateUseType ) );
 }
 
Index: src/SynTree/Visitor.h
===================================================================
--- src/SynTree/Visitor.h	(revision 51fcaf8df28d845472ddec8c08cdb4b238f2aa9c)
+++ src/SynTree/Visitor.h	(revision 1e1e15b0a9bff1f799aa31c369722802cfb1792b)
@@ -104,7 +104,7 @@
 	virtual void visit( Constant *constant );
   private:
-	virtual void visit( AggregateDecl *aggregateDecl );
-	virtual void visit( NamedTypeDecl *typeDecl );
-	virtual void visit( ReferenceToType *aggregateUseType );
+	virtual void handleAggregateDecl( AggregateDecl *aggregateDecl );
+	virtual void handleNamedTypeDecl( NamedTypeDecl *typeDecl );
+	virtual void handleReferenceToType( ReferenceToType *aggregateUseType );
 };