Index: src/SynTree/AddressExpr.cc
===================================================================
--- src/SynTree/AddressExpr.cc	(revision aa72198ced56bbcddd28dbb3b919708fc8b12df3)
+++ src/SynTree/AddressExpr.cc	(revision e3e16bcf91a7300a6d1f71eaad04e2f3f498cfc2)
@@ -47,5 +47,5 @@
 		} else {
 			// taking address of non-lvalue -- must be a reference, loses one layer of reference
-			ReferenceType * refType = safe_dynamic_cast< ReferenceType * >( arg->get_result() );
+			ReferenceType * refType = strict_dynamic_cast< ReferenceType * >( arg->get_result() );
 			set_result( addrType( refType->get_base() ) );
 		}
Index: src/SynTree/ApplicationExpr.cc
===================================================================
--- src/SynTree/ApplicationExpr.cc	(revision aa72198ced56bbcddd28dbb3b919708fc8b12df3)
+++ src/SynTree/ApplicationExpr.cc	(revision e3e16bcf91a7300a6d1f71eaad04e2f3f498cfc2)
@@ -14,5 +14,5 @@
 //
 
-#include <cassert>               // for safe_dynamic_cast, assert
+#include <cassert>               // for strict_dynamic_cast, assert
 #include <list>                  // for list
 #include <map>                   // for _Rb_tree_const_iterator, map, map<>:...
@@ -50,6 +50,6 @@
 
 ApplicationExpr::ApplicationExpr( Expression *funcExpr, const std::list<Expression *> & args ) : function( funcExpr ), args( args ) {
-	PointerType *pointer = safe_dynamic_cast< PointerType* >( funcExpr->get_result() );
-	FunctionType *function = safe_dynamic_cast< FunctionType* >( pointer->get_base() );
+	PointerType *pointer = strict_dynamic_cast< PointerType* >( funcExpr->get_result() );
+	FunctionType *function = strict_dynamic_cast< FunctionType* >( pointer->get_base() );
 
 	set_result( ResolvExpr::extractResultType( function ) );
Index: src/SynTree/CompoundStmt.cc
===================================================================
--- src/SynTree/CompoundStmt.cc	(revision aa72198ced56bbcddd28dbb3b919708fc8b12df3)
+++ src/SynTree/CompoundStmt.cc	(revision e3e16bcf91a7300a6d1f71eaad04e2f3f498cfc2)
@@ -14,5 +14,5 @@
 //
 
-#include <cassert>                    // for assert, safe_dynamic_cast
+#include <cassert>                    // for assert, strict_dynamic_cast
 #include <list>                       // for list, _List_const_iterator, lis...
 #include <ostream>                    // for operator<<, ostream, basic_ostream
@@ -52,7 +52,7 @@
 		Statement * origStmt = *origit++;
 		if ( DeclStmt * declStmt = dynamic_cast< DeclStmt * >( s ) ) {
-			DeclStmt * origDeclStmt = safe_dynamic_cast< DeclStmt * >( origStmt );
+			DeclStmt * origDeclStmt = strict_dynamic_cast< DeclStmt * >( origStmt );
 			if ( DeclarationWithType * dwt = dynamic_cast< DeclarationWithType * > ( declStmt->get_decl() ) ) {
-				DeclarationWithType * origdwt = safe_dynamic_cast< DeclarationWithType * > ( origDeclStmt->get_decl() );
+				DeclarationWithType * origdwt = strict_dynamic_cast< DeclarationWithType * > ( origDeclStmt->get_decl() );
 				assert( dwt->get_name() == origdwt->get_name() );
 				declMap[ origdwt ] = dwt;
Index: src/SynTree/Constant.cc
===================================================================
--- src/SynTree/Constant.cc	(revision aa72198ced56bbcddd28dbb3b919708fc8b12df3)
+++ src/SynTree/Constant.cc	(revision e3e16bcf91a7300a6d1f71eaad04e2f3f498cfc2)
@@ -14,5 +14,5 @@
 //
 
-#include <cassert>   // for safe_dynamic_cast, assertf
+#include <cassert>   // for strict_dynamic_cast, assertf
 #include <iostream>  // for operator<<, ostream, basic_ostream
 #include <string>    // for to_string, string, char_traits, operator<<
@@ -58,10 +58,10 @@
 
 unsigned long long Constant::get_ival() const {
-	assertf( safe_dynamic_cast<BasicType*>(type)->isInteger(), "Attempt to retrieve ival from non-integer constant." );
+	assertf( strict_dynamic_cast<BasicType*>(type)->isInteger(), "Attempt to retrieve ival from non-integer constant." );
 	return val.ival;
 }
 
 double Constant::get_dval() const {
-	assertf( ! safe_dynamic_cast<BasicType*>(type)->isInteger(), "Attempt to retrieve dval from integer constant." );
+	assertf( ! strict_dynamic_cast<BasicType*>(type)->isInteger(), "Attempt to retrieve dval from integer constant." );
 	return val.dval;
 }
Index: src/SynTree/Declaration.h
===================================================================
--- src/SynTree/Declaration.h	(revision aa72198ced56bbcddd28dbb3b919708fc8b12df3)
+++ src/SynTree/Declaration.h	(revision e3e16bcf91a7300a6d1f71eaad04e2f3f498cfc2)
@@ -156,5 +156,5 @@
 
 	Type * get_type() const { return type; }
-	virtual void set_type(Type * t) { type = safe_dynamic_cast< FunctionType* >( t ); }
+	virtual void set_type(Type * t) { type = strict_dynamic_cast< FunctionType* >( t ); }
 
 	FunctionType * get_functionType() const { return type; }
Index: src/SynTree/TupleExpr.cc
===================================================================
--- src/SynTree/TupleExpr.cc	(revision aa72198ced56bbcddd28dbb3b919708fc8b12df3)
+++ src/SynTree/TupleExpr.cc	(revision e3e16bcf91a7300a6d1f71eaad04e2f3f498cfc2)
@@ -14,5 +14,5 @@
 //
 
-#include <cassert>              // for assert, safe_dynamic_cast, assertf
+#include <cassert>              // for assert, strict_dynamic_cast, assertf
 #include <iterator>             // for next
 #include <list>                 // for list, _List_iterator
@@ -64,5 +64,5 @@
 
 TupleIndexExpr::TupleIndexExpr( Expression * tuple, unsigned int index ) : tuple( tuple ), index( index )  {
-	TupleType * type = safe_dynamic_cast< TupleType * >( tuple->get_result() );
+	TupleType * type = strict_dynamic_cast< TupleType * >( tuple->get_result() );
 	assertf( type->size() > index, "TupleIndexExpr index out of bounds: tuple size %d, requested index %d in expr %s", type->size(), index, toString( tuple ).c_str() );
 	set_result( (*std::next( type->get_types().begin(), index ))->clone() );