Index: tests/bugs/10.cfa
===================================================================
--- tests/bugs/10.cfa	(revision 0cc43e1fadb39979645cb0d70447d7e7db2ee4c5)
+++ tests/bugs/10.cfa	(revision dafbde8dedf38315f3298b109629f5e705f00ebe)
@@ -2,5 +2,5 @@
 // https://cforall.uwaterloo.ca/trac/ticket/10
 
-forall(otype T)
+forall(T)
 struct result {
       union {
Index: tests/bugs/104.cfa
===================================================================
--- tests/bugs/104.cfa	(revision 0cc43e1fadb39979645cb0d70447d7e7db2ee4c5)
+++ tests/bugs/104.cfa	(revision dafbde8dedf38315f3298b109629f5e705f00ebe)
@@ -4,5 +4,5 @@
 [ float, float ] modf_( float x );
 
-forall(otype T | { [T, T] modf_(T); })
+forall(T | { [T, T] modf_(T); })
 void modf(T);
 
Index: tests/bugs/194.cfa
===================================================================
--- tests/bugs/194.cfa	(revision 0cc43e1fadb39979645cb0d70447d7e7db2ee4c5)
+++ tests/bugs/194.cfa	(revision dafbde8dedf38315f3298b109629f5e705f00ebe)
@@ -2,9 +2,9 @@
 // https://cforall.uwaterloo.ca/trac/ticket/194
 
-forall( dtype T | sized(T) ) T * foo( void ) {
+forall( T & | sized(T) ) T * foo( void ) {
       printf( "foo1\n" );
 	return (T *)0;
 }
-forall( dtype T | sized(T) ) T & foo( void ) {
+forall( T & | sized(T) ) T & foo( void ) {
 	printf( "foo2\n" );
 	return (T &)*(T *)0;
Index: tests/bugs/196.cfa
===================================================================
--- tests/bugs/196.cfa	(revision 0cc43e1fadb39979645cb0d70447d7e7db2ee4c5)
+++ tests/bugs/196.cfa	(revision dafbde8dedf38315f3298b109629f5e705f00ebe)
@@ -2,8 +2,8 @@
 // https://cforall.uwaterloo.ca/trac/ticket/196
 
-forall(dtype T)
+forall(T &)
 struct link;
 
-forall(dtype T)
+forall(T &)
 struct link {
 	link(T) * next;
@@ -12,13 +12,13 @@
 // -----
 
-forall(dtype T)
+forall(T &)
 struct foo;
 
-forall(dtype U)
+forall(U &)
 struct bar {
 	foo(U) * data;
 };
 
-forall(dtype T)
+forall(T &)
 struct foo {};
 
Index: tests/bugs/203-2.cfa
===================================================================
--- tests/bugs/203-2.cfa	(revision 0cc43e1fadb39979645cb0d70447d7e7db2ee4c5)
+++ tests/bugs/203-2.cfa	(revision dafbde8dedf38315f3298b109629f5e705f00ebe)
@@ -1,10 +1,10 @@
 // Trac ticket: https://cforall.uwaterloo.ca/trac/ticket/203
 
-forall(dtype A)
+forall(A &)
 struct empty {
 	// Nothing.
 };
 
-forall(dtype C)
+forall(C &)
 struct wrap_e {
 	empty(C) field;
Index: tests/bugs/203-7.cfa
===================================================================
--- tests/bugs/203-7.cfa	(revision 0cc43e1fadb39979645cb0d70447d7e7db2ee4c5)
+++ tests/bugs/203-7.cfa	(revision dafbde8dedf38315f3298b109629f5e705f00ebe)
@@ -1,10 +1,10 @@
 // Trac ticket: https://cforall.uwaterloo.ca/trac/ticket/203
 
-forall(dtype A)
+forall(A &)
 struct empty {
 	// Nothing.
 };
 
-forall(dtype C)
+forall(C &)
 struct wrap_e {
 	empty(C) field;
Index: tests/bugs/203-9.cfa
===================================================================
--- tests/bugs/203-9.cfa	(revision 0cc43e1fadb39979645cb0d70447d7e7db2ee4c5)
+++ tests/bugs/203-9.cfa	(revision dafbde8dedf38315f3298b109629f5e705f00ebe)
@@ -1,10 +1,10 @@
 // Trac ticket: https://cforall.uwaterloo.ca/trac/ticket/203
 
-forall(dtype A)
+forall(A &)
 struct empty {
 	// Nothing.
 };
 
-forall(dtype C)
+forall(C &)
 struct wrap_e {
 	empty(C) field;
Index: tests/bugs/7.cfa
===================================================================
--- tests/bugs/7.cfa	(revision 0cc43e1fadb39979645cb0d70447d7e7db2ee4c5)
+++ tests/bugs/7.cfa	(revision dafbde8dedf38315f3298b109629f5e705f00ebe)
@@ -8,8 +8,8 @@
 
 // (Bug 1 unresolved as of this test.)
-forall(otype T)
+forall(T)
 struct stack_node;
 
-forall(otype T)
+forall(T)
 struct stack_node {
     stack_node(T) * next;
@@ -17,14 +17,14 @@
 };
 
-forall(otype T)
+forall(T)
 struct stack {
     stack_node(T) * head;
 };
 
-trait stack_errors(otype T) {
+trait stack_errors(T) {
     T emptyStackHandler (stack(T) * this);
 };
 
-forall(otype T | stack_errors(T))
+forall(T | stack_errors(T))
 T pop (stack(T) * this) {
     return (T){};