Index: src/ResolvExpr/AlternativeFinder.cc
===================================================================
--- src/ResolvExpr/AlternativeFinder.cc	(revision 3c13c03a94ca1d4baa7d03b64383f9d28bb7901f)
+++ src/ResolvExpr/AlternativeFinder.cc	(revision 8c49c0e874fb58f676d7d0589d6897e2cf4e9581)
@@ -362,5 +362,5 @@
 	/// Adds type variables to the open variable set and marks their assertions
 	void makeUnifiableVars( Type *type, OpenVarSet &unifiableVars, AssertionSet &needAssertions ) {
-		for ( std::list< TypeDecl* >::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) {
+		for ( Type::ForallList::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) {
 			unifiableVars[ (*tyvar)->get_name() ] = (*tyvar)->get_kind();
 			for ( std::list< DeclarationWithType* >::iterator assert = (*tyvar)->get_assertions().begin(); assert != (*tyvar)->get_assertions().end(); ++assert ) {
Index: src/ResolvExpr/FindOpenVars.cc
===================================================================
--- src/ResolvExpr/FindOpenVars.cc	(revision 3c13c03a94ca1d4baa7d03b64383f9d28bb7901f)
+++ src/ResolvExpr/FindOpenVars.cc	(revision 8c49c0e874fb58f676d7d0589d6897e2cf4e9581)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// FindOpenVars.cc -- 
+// FindOpenVars.cc --
 //
 // Author           : Richard C. Bilson
@@ -47,5 +47,5 @@
 	void FindOpenVars::common_action( Type *type ) {
 		if ( nextIsOpen ) {
-			for ( std::list< TypeDecl* >::const_iterator i = type->get_forall().begin(); i != type->get_forall().end(); ++i ) {
+			for ( Type::ForallList::const_iterator i = type->get_forall().begin(); i != type->get_forall().end(); ++i ) {
 				openVars[ (*i)->get_name() ] = (*i)->get_kind();
 				for ( std::list< DeclarationWithType* >::const_iterator assert = (*i)->get_assertions().begin(); assert != (*i)->get_assertions().end(); ++assert ) {
@@ -56,5 +56,5 @@
 			}
 		} else {
-			for ( std::list< TypeDecl* >::const_iterator i = type->get_forall().begin(); i != type->get_forall().end(); ++i ) {
+			for ( Type::ForallList::const_iterator i = type->get_forall().begin(); i != type->get_forall().end(); ++i ) {
 				closedVars[ (*i)->get_name() ] = (*i)->get_kind();
 				for ( std::list< DeclarationWithType* >::const_iterator assert = (*i)->get_assertions().begin(); assert != (*i)->get_assertions().end(); ++assert ) {
Index: src/ResolvExpr/RenameVars.cc
===================================================================
--- src/ResolvExpr/RenameVars.cc	(revision 3c13c03a94ca1d4baa7d03b64383f9d28bb7901f)
+++ src/ResolvExpr/RenameVars.cc	(revision 8c49c0e874fb58f676d7d0589d6897e2cf4e9581)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// RenameVars.cc -- 
+// RenameVars.cc --
 //
 // Author           : Richard C. Bilson
@@ -115,5 +115,5 @@
 			mapStack.push_front( mapStack.front() );
 			// renames all "forall" type names to `_${level}_${name}'
-			for ( std::list< TypeDecl* >::iterator i = type->get_forall().begin(); i != type->get_forall().end(); ++i ) {
+			for ( Type::ForallList::iterator i = type->get_forall().begin(); i != type->get_forall().end(); ++i ) {
 				std::ostringstream output;
 				output << "_" << level << "_" << (*i)->get_name();
Index: src/ResolvExpr/TypeEnvironment.cc
===================================================================
--- src/ResolvExpr/TypeEnvironment.cc	(revision 3c13c03a94ca1d4baa7d03b64383f9d28bb7901f)
+++ src/ResolvExpr/TypeEnvironment.cc	(revision 8c49c0e874fb58f676d7d0589d6897e2cf4e9581)
@@ -158,6 +158,6 @@
 	}
 
-	void TypeEnvironment::add( const std::list< TypeDecl* > &tyDecls ) {
-		for ( std::list< TypeDecl* >::const_iterator i = tyDecls.begin(); i != tyDecls.end(); ++i ) {
+	void TypeEnvironment::add( const Type::ForallList &tyDecls ) {
+		for ( Type::ForallList::const_iterator i = tyDecls.begin(); i != tyDecls.end(); ++i ) {
 			EqvClass newClass;
 			newClass.vars.insert( (*i)->get_name() );
Index: src/ResolvExpr/TypeEnvironment.h
===================================================================
--- src/ResolvExpr/TypeEnvironment.h	(revision 3c13c03a94ca1d4baa7d03b64383f9d28bb7901f)
+++ src/ResolvExpr/TypeEnvironment.h	(revision 8c49c0e874fb58f676d7d0589d6897e2cf4e9581)
@@ -55,5 +55,5 @@
 		bool lookup( const std::string &var, EqvClass &eqvClass ) const;
 		void add( const EqvClass &eqvClass );
-		void add( const std::list< TypeDecl* > &tyDecls );
+		void add( const Type::ForallList &tyDecls );
 		template< typename SynTreeClass > int apply( SynTreeClass *&type ) const;
 		template< typename SynTreeClass > int applyFree( SynTreeClass *&type ) const;
Index: src/ResolvExpr/Unify.cc
===================================================================
--- src/ResolvExpr/Unify.cc	(revision 3c13c03a94ca1d4baa7d03b64383f9d28bb7901f)
+++ src/ResolvExpr/Unify.cc	(revision 8c49c0e874fb58f676d7d0589d6897e2cf4e9581)
@@ -416,5 +416,5 @@
 
 	void markAssertions( AssertionSet &assertion1, AssertionSet &assertion2, Type *type ) {
-		for ( std::list< TypeDecl* >::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) {
+		for ( Type::ForallList::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) {
 			for ( std::list< DeclarationWithType* >::const_iterator assert = (*tyvar)->get_assertions().begin(); assert != (*tyvar)->get_assertions().end(); ++assert ) {
 				markAssertionSet( assertion1, *assert );