Index: src/ControlStruct/ExceptTranslate.cc
===================================================================
--- src/ControlStruct/ExceptTranslate.cc	(revision 720a007d78876f3bfd5d53074f8096f67afc6912)
+++ src/ControlStruct/ExceptTranslate.cc	(revision bc82faca3bc0290bb14dbb069ed47d51c5ccd327)
@@ -34,5 +34,5 @@
 #include "SynTree/Statement.h"        // for CompoundStmt, CatchStmt, ThrowStmt
 #include "SynTree/Type.h"             // for FunctionType, Type, noQualifiers
-#include "SynTree/VarExprReplacer.h"  // for VarExprReplacer, VarExprReplace...
+#include "SynTree/DeclReplacer.h"     // for DeclReplacer
 #include "SynTree/Visitor.h"          // for acceptAll
 
@@ -314,7 +314,7 @@
 			// Update variables in the body to point to this local copy.
 			{
-				VarExprReplacer::DeclMap mapping;
+				DeclReplacer::DeclMap mapping;
 				mapping[ handler_decl ] = local_except;
-				VarExprReplacer::replace( handler->body, mapping );
+				DeclReplacer::replace( handler->body, mapping );
 			}