Index: libcfa/prelude/prelude-gen.cc
===================================================================
--- libcfa/prelude/prelude-gen.cc	(revision 0d8266c4f61d8230654336163621c6833a342f89)
+++ libcfa/prelude/prelude-gen.cc	(revision e25aa696d501593f0c8f847c014e6dc6b153c1fe)
@@ -1,10 +1,10 @@
-// 
+//
 // Cforall Version 1.0.0 Copyright (C) 2018 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
-// prelude-gen.cc -- 
-// 
+//
+// prelude-gen.cc --
+//
 // Author           : Rob Schluntz and Thierry Delisle
 // Created On       : Sat Feb 16 08:44:58 2019
@@ -12,5 +12,5 @@
 // Last Modified On : Tue Apr  2 17:18:24 2019
 // Update Count     : 37
-// 
+//
 
 #include <algorithm>
@@ -264,14 +264,23 @@
 		for (auto cvq : qualifiersPair) {
 			for (auto is_vol : { "        ", "volatile" }) {
-				cout << "forall(dtype DT) void ?{}(" << cvq.first << type << " * " << is_vol << " &, " << cvq.second << "DT *);" << endl;
+				cout << "forall(dtype DT) void  ?{}(" << cvq.first << type << " * " << is_vol << " &, " << cvq.second << "DT *);" << endl;
 			}
 		}
-		for (auto cvq : qualifiersSingle) {
-			for (auto is_vol : { "        ", "volatile" }) {
-				cout << "forall(dtype DT) void ?{}(" << cvq << type << " * " << is_vol << " &);" << endl;
-			}
-			for (auto is_vol : { "        ", "volatile" }) {
-				cout << "forall(dtype DT) void ^?{}(" << cvq << type << " * " << is_vol << " &);" << endl;
-			}
+	}
+	for (auto cvq : qualifiersSingle) {
+		for (auto is_vol : { "        ", "volatile" }) {
+			cout << "void  ?{}(" << cvq << "void" << " * " << is_vol << " &);" << endl;
+		}
+		for (auto is_vol : { "        ", "volatile" }) {
+			cout << "void ^?{}(" << cvq << "void" << " * " << is_vol << " &);" << endl;
+		}
+	}
+
+	for (auto cvq : qualifiersSingle) {
+		for (auto is_vol : { "        ", "volatile" }) {
+			cout << "forall(dtype DT) void  ?{}(" << cvq << "  DT" << " * " << is_vol << " &);" << endl;
+		}
+		for (auto is_vol : { "        ", "volatile" }) {
+			cout << "forall(dtype DT) void ^?{}(" << cvq << "  DT" << " * " << is_vol << " &);" << endl;
 		}
 	}
@@ -288,5 +297,5 @@
 	cout << endl;
 
-	cout << "forall(ftype FT) void	?{}( FT *	   &, zero_t );	" << endl;
+	cout << "forall(ftype FT) void	?{}( FT *	   &, zero_t );" << endl;
 	cout << "forall(ftype FT) FT *			?=?( FT *	   &, zero_t );" << endl;
 	cout << "forall(ftype FT) FT *			?=?( FT * volatile &, zero_t );" << endl;