Index: tests/exceptions/defaults.cfa
===================================================================
--- tests/exceptions/defaults.cfa	(revision ab8c6a6efe9f4120bf5d5eed0b649cad34d89af3)
+++ tests/exceptions/defaults.cfa	(revision dafbde8dedf38315f3298b109629f5e705f00ebe)
@@ -55,5 +55,5 @@
 
 void unhandled_test(void) {
-	forall(dtype T, dtype V | is_exception(T, V))
+	forall(T &, V & | is_exception(T, V))
 	void defaultTerminationHandler(T &) {
 		throw (unhandled_exception){};
Index: tests/exceptions/polymorphic.cfa
===================================================================
--- tests/exceptions/polymorphic.cfa	(revision ab8c6a6efe9f4120bf5d5eed0b649cad34d89af3)
+++ tests/exceptions/polymorphic.cfa	(revision dafbde8dedf38315f3298b109629f5e705f00ebe)
@@ -3,6 +3,6 @@
 #include <exception.hfa>
 
-FORALL_TRIVIAL_EXCEPTION(proxy, (otype T), (T));
-FORALL_TRIVIAL_INSTANCE(proxy, (otype U), (U))
+FORALL_TRIVIAL_EXCEPTION(proxy, (T), (T));
+FORALL_TRIVIAL_INSTANCE(proxy, (U), (U))
 
 const char * msg(proxy(int) * this) { return "proxy(int)"; }
@@ -33,9 +33,9 @@
 }
 
-FORALL_DATA_EXCEPTION(cell, (otype T), (T))(
+FORALL_DATA_EXCEPTION(cell, (T), (T))(
 	T data;
 );
 
-FORALL_DATA_INSTANCE(cell, (otype T), (T))
+FORALL_DATA_INSTANCE(cell, (T), (T))
 
 const char * msg(cell(int) * this) { return "cell(int)"; }
Index: tests/exceptions/virtual-poly.cfa
===================================================================
--- tests/exceptions/virtual-poly.cfa	(revision ab8c6a6efe9f4120bf5d5eed0b649cad34d89af3)
+++ tests/exceptions/virtual-poly.cfa	(revision dafbde8dedf38315f3298b109629f5e705f00ebe)
@@ -16,10 +16,10 @@
 };
 
-forall(otype T)
+forall(T)
 struct mono_child_vtable {
 	mono_base_vtable const * const parent;
 };
 
-forall(otype T)
+forall(T)
 struct mono_child {
 	mono_child_vtable(T) const * virtual_table;
@@ -37,20 +37,20 @@
 }
 
-forall(otype U)
+forall(U)
 struct poly_base_vtable {
 	poly_base_vtable(U) const * const parent;
 };
 
-forall(otype U)
+forall(U)
 struct poly_base {
 	poly_base_vtable(U) const * virtual_table;
 };
 
-forall(otype V)
+forall(V)
 struct poly_child_vtable {
 	poly_base_vtable(V) const * const parent;
 };
 
-forall(otype V)
+forall(V)
 struct poly_child {
 	poly_child_vtable(V) const * virtual_table;