Index: src/ResolvExpr/AlternativeFinder.cc
===================================================================
--- src/ResolvExpr/AlternativeFinder.cc	(revision af397ef8f0a43077863974fc725f7ae0d12ca892)
+++ src/ResolvExpr/AlternativeFinder.cc	(revision ec95d1177c41ea894d346d43b00af99c7f01bb8b)
@@ -97,5 +97,5 @@
 		/// Prunes a list of alternatives down to those that have the minimum conversion cost for a given return type; skips ambiguous interpretations
 		template< typename InputIterator, typename OutputIterator >
-		void pruneAlternatives( InputIterator begin, InputIterator end, OutputIterator out, const SymTab::Indexer &indexer ) {
+		void pruneAlternatives( InputIterator begin, InputIterator end, OutputIterator out ) {
 			// select the alternatives that have the minimum conversion cost for a particular set of result types
 			std::map< std::string, PruneStruct > selected;
@@ -183,5 +183,5 @@
 			)
 			AltList::iterator oldBegin = alternatives.begin();
-			pruneAlternatives( alternatives.begin(), alternatives.end(), front_inserter( alternatives ), indexer );
+			pruneAlternatives( alternatives.begin(), alternatives.end(), front_inserter( alternatives ) );
 			if ( alternatives.begin() == oldBegin ) {
 				std::ostringstream stream;
Index: src/ResolvExpr/CommonType.cc
===================================================================
--- src/ResolvExpr/CommonType.cc	(revision af397ef8f0a43077863974fc725f7ae0d12ca892)
+++ src/ResolvExpr/CommonType.cc	(revision ec95d1177c41ea894d346d43b00af99c7f01bb8b)
@@ -157,7 +157,7 @@
 	void CommonType::visit( PointerType *pointerType ) {
 		if ( PointerType *otherPointer = dynamic_cast< PointerType* >( type2 ) ) {
-			if ( widenFirst && dynamic_cast< VoidType* >( otherPointer->get_base() ) && ! isFtype(pointerType->get_base(), indexer) ) {
+			if ( widenFirst && dynamic_cast< VoidType* >( otherPointer->get_base() ) && ! isFtype(pointerType->get_base()) ) {
 				getCommonWithVoidPointer( otherPointer, pointerType );
-			} else if ( widenSecond && dynamic_cast< VoidType* >( pointerType->get_base() ) && ! isFtype(otherPointer->get_base(), indexer) ) {
+			} else if ( widenSecond && dynamic_cast< VoidType* >( pointerType->get_base() ) && ! isFtype(otherPointer->get_base()) ) {
 				getCommonWithVoidPointer( pointerType, otherPointer );
 			} else if ( ( pointerType->get_base()->get_qualifiers() >= otherPointer->get_base()->get_qualifiers() || widenFirst )
Index: src/ResolvExpr/Unify.cc
===================================================================
--- src/ResolvExpr/Unify.cc	(revision af397ef8f0a43077863974fc725f7ae0d12ca892)
+++ src/ResolvExpr/Unify.cc	(revision ec95d1177c41ea894d346d43b00af99c7f01bb8b)
@@ -114,5 +114,5 @@
 	}
 
-	bool isFtype( Type *type, const SymTab::Indexer &indexer ) {
+	bool isFtype( Type *type ) {
 		if ( dynamic_cast< FunctionType* >( type ) ) {
 			return true;
@@ -123,5 +123,5 @@
 	}
 
-	bool tyVarCompatible( const TypeDecl::Data & data, Type *type, const SymTab::Indexer &indexer ) {
+	bool tyVarCompatible( const TypeDecl::Data & data, Type *type ) {
 		switch ( data.kind ) {
 		  case TypeDecl::Any:
@@ -131,7 +131,7 @@
 			// type must also be complete
 			// xxx - should this also check that type is not a tuple type and that it's not a ttype?
-			return ! isFtype( type, indexer ) && (! data.isComplete || type->isComplete() );
+			return ! isFtype( type ) && (! data.isComplete || type->isComplete() );
 		  case TypeDecl::Ftype:
-			return isFtype( type, indexer );
+			return isFtype( type );
 		  case TypeDecl::Ttype:
 			// ttype unifies with any tuple type
@@ -144,5 +144,5 @@
 		OpenVarSet::const_iterator tyvar = openVars.find( typeInst->get_name() );
 		assert( tyvar != openVars.end() );
-		if ( ! tyVarCompatible( tyvar->second, other, indexer ) ) {
+		if ( ! tyVarCompatible( tyvar->second, other ) ) {
 			return false;
 		} // if
Index: src/ResolvExpr/typeops.h
===================================================================
--- src/ResolvExpr/typeops.h	(revision af397ef8f0a43077863974fc725f7ae0d12ca892)
+++ src/ResolvExpr/typeops.h	(revision ec95d1177c41ea894d346d43b00af99c7f01bb8b)
@@ -118,5 +118,5 @@
 
 	// in Unify.cc
-	bool isFtype( Type *type, const SymTab::Indexer &indexer );
+	bool isFtype( Type *type );
 	bool typesCompatible( Type *, Type *, const SymTab::Indexer &indexer, const TypeEnvironment &env );
 	bool typesCompatibleIgnoreQualifiers( Type *, Type *, const SymTab::Indexer &indexer, const TypeEnvironment &env );