Index: tests/exceptions/cardgame.cfa
===================================================================
--- tests/exceptions/cardgame.cfa	(revision d96f7c4f1e2b7dfb521e83969e9704b7e12505da)
+++ tests/exceptions/cardgame.cfa	(revision 9506c704946ca74a10747460a7b64c9a3a6a05c4)
@@ -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 d96f7c4f1e2b7dfb521e83969e9704b7e12505da)
+++ tests/exceptions/defaults.cfa	(revision 9506c704946ca74a10747460a7b64c9a3a6a05c4)
@@ -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 d96f7c4f1e2b7dfb521e83969e9704b7e12505da)
+++ tests/exceptions/try-leave-catch.cfa	(revision 9506c704946ca74a10747460a7b64c9a3a6a05c4)
@@ -38,4 +38,5 @@
 			break;
 		}
+		fallthrough;
 	default:
 		printf("Reached default.\n");