Index: src/ControlStruct/ExceptTranslate.cc
===================================================================
--- src/ControlStruct/ExceptTranslate.cc	(revision 046a8903d149ffd7aa25c33fdf767b8e68ffaaca)
+++ src/ControlStruct/ExceptTranslate.cc	(revision 6089f4da1164c02fb0810480b753e785612f5318)
@@ -10,6 +10,6 @@
 // Created On       : Wed Jun 14 16:49:00 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Tue May 19 16:46:00 2020
-// Update Count     : 14
+// Last Modified On : Thr May 21 13:18:00 2020
+// Update Count     : 15
 //
 
@@ -182,16 +182,5 @@
 	}
 
-	class TryMutatorCore : public WithGuards {
-		enum Context { NoHandler, TerHandler, ResHandler };
-
-		// Also need to handle goto, break & continue.
-		// They need to be cut off in a ResHandler, until we enter another
-		// loop, switch or the goto stays within the function.
-
-		Context cur_context;
-
-		// The current (innermost) termination handler exception declaration.
-		ObjectDecl * handler_except_decl;
-
+	class TryMutatorCore {
 		// The built in types used in translation.
 		StructDecl * except_decl;
@@ -234,6 +223,4 @@
 	public:
 		TryMutatorCore() :
-			cur_context( NoHandler ),
-			handler_except_decl( nullptr ),
 			except_decl( nullptr ), node_decl( nullptr ), hook_decl( nullptr ),
 			try_func_t( noQualifiers, false ),
@@ -244,5 +231,4 @@
 		{}
 
-		void premutate( CatchStmt *catchStmt );
 		void premutate( StructDecl *structDecl );
 		Statement * postmutate( ThrowStmt *throwStmt );
@@ -579,5 +565,5 @@
 	FunctionDecl * TryMutatorCore::create_finally_wrapper(
 			TryStmt * tryStmt ) {
-		// void finally() { <finally code> }
+		// void finally() { `finally->block` }
 		FinallyStmt * finally = tryStmt->get_finally();
 		CompoundStmt * body = finally->get_block();
@@ -618,27 +604,4 @@
 
 	// Visiting/Mutating Functions
-	void TryMutatorCore::premutate( CatchStmt *catchStmt ) {
-		// Validate the Statement's form.
-		ObjectDecl * decl = dynamic_cast<ObjectDecl *>( catchStmt->get_decl() );
-		if ( decl && true /* check decl->get_type() */ ) {
-			// Pass.
-		} else if ( CatchStmt::Terminate == catchStmt->get_kind() ) {
-			SemanticError(catchStmt->location, "catch must have exception type");
-		} else {
-			SemanticError(catchStmt->location, "catchResume must have exception type");
-		}
-
-		// Track the handler context.
-		GuardValue( cur_context );
-		if ( CatchStmt::Terminate == catchStmt->get_kind() ) {
-			cur_context = TerHandler;
-
-			GuardValue( handler_except_decl );
-			handler_except_decl = decl;
-		} else {
-			cur_context = ResHandler;
-		}
-	}
-
 	void TryMutatorCore::premutate( StructDecl *structDecl ) {
 		if ( !structDecl->has_body() ) {