Index: tests/Makefile.am
===================================================================
--- tests/Makefile.am	(revision 8705a11c8492eccab09e0fae1cbc4c1551beace8)
+++ tests/Makefile.am	(revision 4be01174e416453134c91b2bd79737cea7f5d3f7)
@@ -76,8 +76,4 @@
 # Tests that need investigation from the CFA team about why they require lax wflags.  Goal is to eliminate this list.
 WFLAGS_OPT_LAX_TO_INVESTIGATE = \
-	exceptions/cardgame \
-	exceptions/defaults \
-	exceptions/defaults-threads \
-	exceptions/try-leave-catch \
 	forall \
 	include/includes \
Index: tests/exceptions/cardgame.cfa
===================================================================
--- tests/exceptions/cardgame.cfa	(revision 8705a11c8492eccab09e0fae1cbc4c1551beace8)
+++ tests/exceptions/cardgame.cfa	(revision 4be01174e416453134c91b2bd79737cea7f5d3f7)
@@ -29,5 +29,4 @@
 
 static unsigned int NumPlayersRemaining;				// number of players currently in the game
-static unsigned int rounds;								// count rounds during Schmilblick
 
 static unsigned int MakePlay( Player & player, unsigned int RemainingCards ) with( player ) {
@@ -125,5 +124,5 @@
 				seed = convert( argv[4] ); if ( seed < 1 ) throw ExceptionInst( cmd_error ); // invalid ?
 			} // if
-			// FALL THROUGH
+			fallthrough;
 		  case 4:
 			if ( strcmp( argv[3], "d" ) != 0 ) {		// default ?
@@ -131,5 +130,5 @@
 				cardsSet = true;
 			} // if
-			// FALL THROUGH
+			fallthrough;
 		  case 3:
 			if ( strcmp( argv[2], "d" ) != 0 ) {		// default ?
@@ -137,10 +136,10 @@
 				playersSet = true;
 			} // if
-			// FALL THROUGH
+			fallthrough;
 		  case 2:
 			if ( strcmp( argv[1], "d" ) != 0 ) {		// default ?
 				numGames = convert( argv[1] ); if ( numGames < 0 ) throw ExceptionInst( cmd_error ); // invalid ?
 			} // if
-			// FALL THROUGH
+			fallthrough;
 		  case 1:										// defaults
 			break;
Index: tests/exceptions/defaults.cfa
===================================================================
--- tests/exceptions/defaults.cfa	(revision 8705a11c8492eccab09e0fae1cbc4c1551beace8)
+++ tests/exceptions/defaults.cfa	(revision 4be01174e416453134c91b2bd79737cea7f5d3f7)
@@ -66,10 +66,10 @@
 
 void unhandled_test(void) {
+	void defaultTerminationHandler(unhandled_exception &) {
+		abort();
+	}
 	forall(T &, V & | is_exception(T, V))
 	void defaultTerminationHandler(T &) {
 		throw (unhandled_exception){&unhandled_vt};
-	}
-	void defaultTerminationHandler(unhandled_exception &) {
-		abort();
 	}
 	try {
Index: tests/exceptions/try-leave-catch.cfa
===================================================================
--- tests/exceptions/try-leave-catch.cfa	(revision 8705a11c8492eccab09e0fae1cbc4c1551beace8)
+++ tests/exceptions/try-leave-catch.cfa	(revision 4be01174e416453134c91b2bd79737cea7f5d3f7)
@@ -38,4 +38,5 @@
 			break;
 		}
+		fallthrough;
 	default:
 		printf("Reached default.\n");