Index: src/GenPoly/Box.cc
===================================================================
--- src/GenPoly/Box.cc	(revision bc3127d4673a19c1f70b8cc4cc5902edde3e61d8)
+++ src/GenPoly/Box.cc	(revision e3e16bcf91a7300a6d1f71eaad04e2f3f498cfc2)
@@ -15,5 +15,5 @@
 
 #include <algorithm>                     // for mismatch
-#include <cassert>                       // for assert, safe_dynamic_cast
+#include <cassert>                       // for assert, strict_dynamic_cast
 #include <iostream>                      // for operator<<, stringstream
 #include <list>                          // for list, list<>::iterator, _Lis...
@@ -1299,5 +1299,5 @@
 
 		DeclarationWithType * Pass2::mutate( FunctionDecl *functionDecl ) {
-			functionDecl = safe_dynamic_cast< FunctionDecl * > ( handleDecl( functionDecl ) );
+			functionDecl = strict_dynamic_cast< FunctionDecl * > ( handleDecl( functionDecl ) );
 			FunctionType * ftype = functionDecl->get_functionType();
 			if ( ! ftype->get_returnVals().empty() && functionDecl->get_statements() ) {
@@ -1378,5 +1378,5 @@
 			// move polymorphic return type to parameter list
 			if ( isDynRet( funcType ) ) {
-				ObjectDecl *ret = safe_dynamic_cast< ObjectDecl* >( funcType->get_returnVals().front() );
+				ObjectDecl *ret = strict_dynamic_cast< ObjectDecl* >( funcType->get_returnVals().front() );
 				ret->set_type( new PointerType( Type::Qualifiers(), ret->get_type() ) );
 				funcType->get_parameters().push_front( ret );
Index: src/GenPoly/InstantiateGeneric.cc
===================================================================
--- src/GenPoly/InstantiateGeneric.cc	(revision bc3127d4673a19c1f70b8cc4cc5902edde3e61d8)
+++ src/GenPoly/InstantiateGeneric.cc	(revision e3e16bcf91a7300a6d1f71eaad04e2f3f498cfc2)
@@ -459,5 +459,5 @@
 			Declaration * member = *std::next( aggr->members.begin(), memberIndex );
 			assertf( member->name == memberExpr->member->name, "Instantiation has different member order than the generic type. %s / %s", toString( member ).c_str(), toString( memberExpr->member ).c_str() );
-			DeclarationWithType * field = safe_dynamic_cast< DeclarationWithType * >( member );
+			DeclarationWithType * field = strict_dynamic_cast< DeclarationWithType * >( member );
 			MemberExpr * ret = new MemberExpr( field, memberExpr->aggregate->clone() );
 			std::swap( ret->env, memberExpr->env );
Index: src/GenPoly/Lvalue.cc
===================================================================
--- src/GenPoly/Lvalue.cc	(revision bc3127d4673a19c1f70b8cc4cc5902edde3e61d8)
+++ src/GenPoly/Lvalue.cc	(revision e3e16bcf91a7300a6d1f71eaad04e2f3f498cfc2)
@@ -14,5 +14,5 @@
 //
 
-#include <cassert>                       // for safe_dynamic_cast
+#include <cassert>                       // for strict_dynamic_cast
 #include <string>                        // for string