Index: src/ResolvExpr/Unify.cc
===================================================================
--- src/ResolvExpr/Unify.cc	(revision bbbc067e84adc59b31d39e97991980bf6379934a)
+++ src/ResolvExpr/Unify.cc	(revision 80eefcbc5f9cf0e96b03174100a2ac5bb28ee6ac)
@@ -282,8 +282,8 @@
 
 	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 ( std::list< DeclarationWithType* >::const_iterator assert = (*tyvar)->get_assertions().begin(); assert != (*tyvar)->get_assertions().end(); ++assert ) {
-				markAssertionSet( assertion1, *assert );
-				markAssertionSet( assertion2, *assert );
+		for ( auto tyvar : type->get_forall() ) {
+			for ( auto assert : tyvar->get_assertions() ) {
+				markAssertionSet( assertion1, assert );
+				markAssertionSet( assertion2, assert );
 			} // for
 		} // for