Index: src/ControlStruct/ExceptTranslate.cc
===================================================================
--- src/ControlStruct/ExceptTranslate.cc	(revision 288eede1f5af2a195505be61ef509aea27711ce8)
+++ src/ControlStruct/ExceptTranslate.cc	(revision dcac7afb6b0b9c1a6586e9883db772d9e71ac1f1)
@@ -83,5 +83,5 @@
 
 	void split( CatchList& allHandlers, CatchList& terHandlers,
-	            CatchList& resHandlers ) {
+				CatchList& resHandlers ) {
 		while ( !allHandlers.empty() ) {
 			CatchStmt * stmt = allHandlers.front();
@@ -412,5 +412,5 @@
 
 
-	class ExceptionMutatorCore : public WithScopes {
+	class ExceptionMutatorCore : public WithGuards {
 		enum Context { NoHandler, TerHandler, ResHandler };
 
@@ -490,5 +490,5 @@
 		CatchList resumption_handlers;
 		split( tryStmt->get_catchers(),
-		       termination_handlers, resumption_handlers );
+			   termination_handlers, resumption_handlers );
 
 		if ( resumption_handlers.size() ) {
@@ -548,5 +548,5 @@
 	}
 
-    void translateEHM( std::list< Declaration *> & translationUnit ) {
+	void translateEHM( std::list< Declaration *> & translationUnit ) {
 		init_func_types();