Index: tests/concurrent/examples/boundedBufferEXT.cfa
===================================================================
--- tests/concurrent/examples/boundedBufferEXT.cfa	(revision 44e37ef2cacfe5adf2c7846da0808b66f7a21a4e)
+++ tests/concurrent/examples/boundedBufferEXT.cfa	(revision fd54fef231baeeb0016103bf19cc8e6d87287faf)
@@ -24,5 +24,5 @@
 enum { BufferSize = 50 };
 
-forall( otype T ) {
+forall( T ) {
 	monitor Buffer {
 		int front, back, count;
Index: tests/concurrent/examples/boundedBufferINT.cfa
===================================================================
--- tests/concurrent/examples/boundedBufferINT.cfa	(revision 44e37ef2cacfe5adf2c7846da0808b66f7a21a4e)
+++ tests/concurrent/examples/boundedBufferINT.cfa	(revision fd54fef231baeeb0016103bf19cc8e6d87287faf)
@@ -24,5 +24,5 @@
 enum { BufferSize = 50 };
 
-forall( otype T ) {
+forall( T ) {
 	monitor Buffer {
 		condition full, empty;
Index: tests/concurrent/examples/quickSort.generic.cfa
===================================================================
--- tests/concurrent/examples/quickSort.generic.cfa	(revision 44e37ef2cacfe5adf2c7846da0808b66f7a21a4e)
+++ tests/concurrent/examples/quickSort.generic.cfa	(revision fd54fef231baeeb0016103bf19cc8e6d87287faf)
@@ -21,5 +21,5 @@
 #include <string.h>										// strcmp
 
-forall( otype T | { int ?<?( T, T ); } ) {
+forall( T | { int ?<?( T, T ); } ) {
 	thread Quicksort {
 		T * values;										// communication variables
Index: tests/concurrent/multi-monitor.cfa
===================================================================
--- tests/concurrent/multi-monitor.cfa	(revision 44e37ef2cacfe5adf2c7846da0808b66f7a21a4e)
+++ tests/concurrent/multi-monitor.cfa	(revision fd54fef231baeeb0016103bf19cc8e6d87287faf)
@@ -38,5 +38,5 @@
 }
 
-forall(dtype T | sized(T) | { void ^?{}(T & mutex); })
+forall(T & | sized(T) | { void ^?{}(T & mutex); })
 void delete_mutex(T * x) {
 	^(*x){};