Index: src/tests/except-0.c
===================================================================
--- src/tests/except-0.c	(revision 3f27b9ac2b8f14514c806d4b49cab5c60103870f)
+++ src/tests/except-0.c	(revision fcc88a4758ef6ae240a457212a6e494379cf4268)
@@ -1,3 +1,5 @@
 // Draft of tests for exception handling.
+// Outdated: The integer constant exceptions need to be replaced with virtual
+// exceptions for the new system.
 
 // ERROR: exceptions do not interact with ^?{} properly.
Index: src/tests/except-1.c
===================================================================
--- src/tests/except-1.c	(revision 3f27b9ac2b8f14514c806d4b49cab5c60103870f)
+++ src/tests/except-1.c	(revision fcc88a4758ef6ae240a457212a6e494379cf4268)
@@ -1,3 +1,5 @@
 // Draft memory management test. (remember -fexceptions)
+// Outdated: The integer constant exceptions need to be replaced with virtual
+// exceptions for the new system.
 
 #include <stdio.h>
Index: src/tests/except-2.c
===================================================================
--- src/tests/except-2.c	(revision 3f27b9ac2b8f14514c806d4b49cab5c60103870f)
+++ src/tests/except-2.c	(revision fcc88a4758ef6ae240a457212a6e494379cf4268)
@@ -80,5 +80,5 @@
 }
 num_error_vtable _num_error_vtable_instance @= {
-	&___cfaehm__base_exception_t_vtable_instance,
+	&INSTANCE(BASE_EXCEPT),
 	sizeof(num_error), ?{}, ^?{},
 	num_error_msg, num_error_code
@@ -91,5 +91,5 @@
 		yin black;
 		throw (BASE_EXCEPT *)&black;
-	} catch( yin * error ) {
+	} catch ( yin * error ) {
 		printf("throw yin caught.\n");
 	}
@@ -99,20 +99,19 @@
 		throwResume (BASE_EXCEPT *)&white;
 		printf("> throwResume returned.\n");
-	} catchResume( yang * error ) {
+	} catchResume ( yang * error ) {
 		printf("throwResume yang caught <");
 	}
 
-	/* Conditional catches are still a work in progress.
 	try {
 		num_error x = { 2 };
-		throw (struct exception_t *)&x;
+		throw (BASE_EXCEPT *)&x;
 	}
-	catch (num_error * error0 ; 3 == error0->virtual_table->code( error0 ) ) {
-		printf("exception at %p\n", error0 );
+	catch (num_error * error ; 3 == error->virtual_table->code( error ) ) {
+		printf("exception at %p\n", error );
 		printf("Should not be printed.\n");
 	}
-	catch (num_error * error1 ; 2 == error1->virtual_table->code( error1 ) ) {
+	catch (num_error * error ; 2 == error->virtual_table->code( error ) ) {
 		printf("Should be printed.\n");
-	}*/
+	}
 }