Index: src/Concurrency/Keywords.cc
===================================================================
--- src/Concurrency/Keywords.cc	(revision 68f9c43ecf1873cbb5f06aee682704b56612ed16)
+++ src/Concurrency/Keywords.cc	(revision 8d7bef249652cc2b9854c7090c758bcd9ad9f613)
@@ -200,13 +200,8 @@
 		StructDecl* dtor_guard_decl = nullptr;
 
-		static std::unique_ptr< Type > generic_func;
+		static Type* generic_func;
 	};
 
-	std::unique_ptr< Type > MutexKeyword::generic_func = std::unique_ptr< Type >(
-		new FunctionType(
-			noQualifiers,
-			true
-		)
-	);
+	Type* MutexKeyword::generic_func = new FunctionType{ noQualifiers, true };
 
 	//-----------------------------------------------------------------------------
Index: src/Concurrency/Waitfor.cc
===================================================================
--- src/Concurrency/Waitfor.cc	(revision 68f9c43ecf1873cbb5f06aee682704b56612ed16)
+++ src/Concurrency/Waitfor.cc	(revision 8d7bef249652cc2b9854c7090c758bcd9ad9f613)
@@ -137,6 +137,4 @@
 		StructDecl          * decl_acceptable = nullptr;
 		StructDecl          * decl_monitor    = nullptr;
-
-		static std::unique_ptr< Type > generic_func;
 
 		UniqueName namer_acc = "__acceptables_"s;
