Index: src/Concurrency/Keywords.cc
===================================================================
--- src/Concurrency/Keywords.cc	(revision 3b0c8cb586be8d0301bb5c39e69256689eab55d9)
+++ src/Concurrency/Keywords.cc	(revision 2a3d44698a8f41614824b5eaaf857999a33d334b)
@@ -11,5 +11,5 @@
 // Last Modified By :
 // Last Modified On :
-// Update Count     : 5
+// Update Count     : 9
 //
 
@@ -53,5 +53,5 @@
 	  public:
 
-	  	ConcurrentSueKeyword( std::string&& type_name, std::string&& field_name, std::string&& getter_name, std::string&& context_error, bool needs_main, KeywordCastExpr::Target cast_target ) :
+	  	ConcurrentSueKeyword( std::string&& type_name, std::string&& field_name, std::string&& getter_name, std::string&& context_error, bool needs_main, AggregateDecl::Aggregate cast_target ) :
 		  type_name( type_name ), field_name( field_name ), getter_name( getter_name ), context_error( context_error ), needs_main( needs_main ), cast_target( cast_target ) {}
 
@@ -76,5 +76,5 @@
 		const std::string context_error;
 		bool needs_main;
-		KeywordCastExpr::Target cast_target;
+		AggregateDecl::Aggregate cast_target;
 
 		StructDecl   * type_decl = nullptr;
@@ -101,5 +101,5 @@
 			"thread keyword requires threads to be in scope, add #include <thread.hfa>\n",
 			true,
-			KeywordCastExpr::Thread
+			AggregateDecl::Thread
 		)
 		{}
@@ -133,5 +133,5 @@
 			"coroutine keyword requires coroutines to be in scope, add #include <coroutine.hfa>\n",
 			true,
-			KeywordCastExpr::Coroutine
+			AggregateDecl::Coroutine
 		)
 		{}
@@ -165,5 +165,5 @@
 			"monitor keyword requires monitors to be in scope, add #include <monitor.hfa>\n",
 			false,
-			KeywordCastExpr::Monitor
+			AggregateDecl::Monitor
 		)
 		{}
Index: src/Concurrency/Waitfor.cc
===================================================================
--- src/Concurrency/Waitfor.cc	(revision 3b0c8cb586be8d0301bb5c39e69256689eab55d9)
+++ src/Concurrency/Waitfor.cc	(revision 2a3d44698a8f41614824b5eaaf857999a33d334b)
@@ -11,5 +11,5 @@
 // Last Modified By :
 // Last Modified On :
-// Update Count     : 7
+// Update Count     : 10
 //
 
@@ -23,4 +23,5 @@
 #include "Common/PassVisitor.h"    // for PassVisitor
 #include "Common/SemanticError.h"  // for SemanticError
+#include "Common/UniqueName.h"	   // for UniqueName
 #include "Common/utility.h"        // for deleteAll, map_range
 #include "CodeGen/OperatorTable.h" // for isConstructor