Index: src/ControlStruct/ExceptTranslate.cc
===================================================================
--- src/ControlStruct/ExceptTranslate.cc	(revision 6d49ea3165b7fb8906721da9a6f6949632d35140)
+++ src/ControlStruct/ExceptTranslate.cc	(revision 274ce8c98a0dc1608308c1bd35c41bcd52a1c812)
@@ -10,6 +10,6 @@
 // Created On       : Wed Jun 14 16:49:00 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Tus Aug  8 16:54:00 2017
-// Update Count     : 7
+// Last Modified On : Thr Aug 17 17:19:00 2017
+// Update Count     : 9
 //
 
@@ -166,5 +166,6 @@
 			/*bitfieldWidth*/ NULL,
 			new BasicType( noQualifiers, BasicType::Bool ),
-			/*init*/ NULL
+			/*init*/ NULL,
+			std::list<Attribute *>{ new Attribute( "unused" ) }
 			);
 		ObjectDecl voidptr_obj(
@@ -183,7 +184,10 @@
 			);
 
+		ObjectDecl * unused_index_obj = index_obj.clone();
+		unused_index_obj->attributes.push_back( new Attribute( "unused" ) );
+
 		catch_func_t.get_parameters().push_back( index_obj.clone() );
 		catch_func_t.get_parameters().push_back( exception_obj.clone() );
-		match_func_t.get_returnVals().push_back( index_obj.clone() );
+		match_func_t.get_returnVals().push_back( unused_index_obj );
 		match_func_t.get_parameters().push_back( exception_obj.clone() );
 		handle_func_t.get_returnVals().push_back( bool_obj.clone() );
@@ -417,6 +421,6 @@
 		}
 
-		body->push_back( new ReturnStmt( noLabels, new ConstantExpr(
-			Constant::from_int( 0 ) ) ) );
+		body->push_back( new ReturnStmt( noLabels,
+			new ConstantExpr( Constant::from_int( 0 ) ) ) );
 
 		return new FunctionDecl("match", Type::StorageClasses(),
@@ -449,5 +453,5 @@
 		CompoundStmt * body = new CompoundStmt( noLabels );
 
-		FunctionType * func_type = match_func_t.clone();
+		FunctionType * func_type = handle_func_t.clone();
 		DeclarationWithType * except_obj = func_type->get_parameters().back();
 
@@ -472,6 +476,6 @@
 		}
 
-		body->push_back( new ReturnStmt( noLabels, new ConstantExpr(
-			Constant::from_bool( false ) ) ) );
+		body->push_back( new ReturnStmt( noLabels,
+			new ConstantExpr( Constant::from_bool( false ) ) ) );
 
 		return new FunctionDecl("handle", Type::StorageClasses(),
Index: src/ControlStruct/LabelGenerator.cc
===================================================================
--- src/ControlStruct/LabelGenerator.cc	(revision 6d49ea3165b7fb8906721da9a6f6949632d35140)
+++ src/ControlStruct/LabelGenerator.cc	(revision 274ce8c98a0dc1608308c1bd35c41bcd52a1c812)
@@ -9,10 +9,11 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jun 23 12:18:34 2015
-// Update Count     : 13
+// Last Modified By : Andrew Beach
+// Last Modified On : Thr Aug 14 14:14:00 2015
+// Update Count     : 14
 //
 
-#include <iostream>             // for operator<<, basic_ostream, ostringstream
+#include <iostream>             // for operator<<, basic_ostream
+#include <sstream>              // for ostringstream
 #include <list>                 // for list