Index: src/AST/Node.hpp
===================================================================
--- src/AST/Node.hpp	(revision 418882afb89c90d42a4199db59843426687a4df0)
+++ src/AST/Node.hpp	(revision cd5eb4b3e078ce0a3a9774937e96c7e432ebc390)
@@ -19,5 +19,4 @@
 #include <cstddef>     // for nullptr_t
 #include <iosfwd>
-#include <type_traits> // for remove_reference
 
 #include "Common/ErrorObjects.h"  // for SemanticErrorException
@@ -36,6 +35,6 @@
 	Node(const Node&) : strong_count(0), weak_count(0) {}
 	Node(Node&&) : strong_count(0), weak_count(0) {}
-	Node& operator= (const Node&) = delete;
-	Node& operator= (Node&&) = delete;
+	Node& operator=(const Node&) = delete;
+	Node& operator=(Node&&) = delete;
 	virtual ~Node() {}
 
Index: src/GenPoly/GenPoly.cc
===================================================================
--- src/GenPoly/GenPoly.cc	(revision 418882afb89c90d42a4199db59843426687a4df0)
+++ src/GenPoly/GenPoly.cc	(revision cd5eb4b3e078ce0a3a9774937e96c7e432ebc390)
@@ -24,5 +24,7 @@
 #include <vector>                       // for vector
 
+#include "AST/Expr.hpp"
 #include "AST/Type.hpp"
+#include "AST/TypeSubstitution.hpp"
 #include "GenPoly/ErasableScopedMap.h"  // for ErasableScopedMap<>::const_it...
 #include "ResolvExpr/typeops.h"         // for flatten
Index: src/Parser/lex.ll
===================================================================
--- src/Parser/lex.ll	(revision 418882afb89c90d42a4199db59843426687a4df0)
+++ src/Parser/lex.ll	(revision cd5eb4b3e078ce0a3a9774937e96c7e432ebc390)
@@ -10,6 +10,6 @@
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
- * Last Modified On : Thu Oct 13 20:46:04 2022
- * Update Count     : 764
+ * Last Modified On : Fri Jan 20 12:08:37 2023
+ * Update Count     : 766
  */
 
@@ -340,4 +340,5 @@
 vtable			{ KEYWORD_RETURN(VTABLE); }				// CFA
 waitfor			{ KEYWORD_RETURN(WAITFOR); }			// CFA
+waituntil		{ KEYWORD_RETURN(WAITUNTIL); }			// CFA
 when			{ KEYWORD_RETURN(WHEN); }				// CFA
 while			{ KEYWORD_RETURN(WHILE); }
Index: src/Parser/parser.yy
===================================================================
--- src/Parser/parser.yy	(revision 418882afb89c90d42a4199db59843426687a4df0)
+++ src/Parser/parser.yy	(revision cd5eb4b3e078ce0a3a9774937e96c7e432ebc390)
@@ -10,6 +10,6 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Nov 21 22:34:30 2022
-// Update Count     : 5848
+// Last Modified On : Fri Jan 20 12:11:56 2023
+// Update Count     : 5855
 //
 
@@ -331,5 +331,5 @@
 %token ATTRIBUTE EXTENSION								// GCC
 %token IF ELSE SWITCH CASE DEFAULT DO WHILE FOR BREAK CONTINUE GOTO RETURN
-%token CHOOSE FALLTHRU FALLTHROUGH WITH WHEN WAITFOR	// CFA
+%token CHOOSE FALLTHRU FALLTHROUGH WITH WHEN WAITFOR WAITUNTIL // CFA
 %token DISABLE ENABLE TRY THROW THROWRESUME AT			// CFA
 %token ASM												// C99, extension ISO/IEC 9899:1999 Section J.5.10(1)
@@ -1939,4 +1939,5 @@
 	TYPEDEF type_specifier declarator
 		{
+			// if type_specifier is an anon aggregate => name 
 			typedefTable.addToEnclosingScope( *$3->name, TYPEDEFname, "4" );
 			$$ = $3->addType( $2 )->addTypedef();
@@ -2473,4 +2474,6 @@
 	| EXTENSION type_specifier field_declaring_list_opt ';'	// GCC
 		{ $$ = fieldDecl( $2, $3 ); distExt( $$ ); }
+	| STATIC type_specifier field_declaring_list_opt ';' // CFA
+	   	{ SemanticError( yylloc, "STATIC aggregate field qualifier currently unimplemented." ); $$ = nullptr; }
 	| INLINE type_specifier field_abstract_list_opt ';'	// CFA
 		{
Index: src/ResolvExpr/typeops.h
===================================================================
--- src/ResolvExpr/typeops.h	(revision 418882afb89c90d42a4199db59843426687a4df0)
+++ src/ResolvExpr/typeops.h	(revision cd5eb4b3e078ce0a3a9774937e96c7e432ebc390)
@@ -18,13 +18,5 @@
 #include <vector>
 
-#include "Cost.h"
-#include "TypeEnvironment.h"
-#include "WidenMode.h"
-#include "AST/Fwd.hpp"
-#include "AST/Node.hpp"
-#include "AST/SymbolTable.hpp"
 #include "AST/Type.hpp"
-#include "AST/TypeEnvironment.hpp"
-#include "SynTree/SynTree.h"
 #include "SynTree/Type.h"
 
@@ -34,4 +26,6 @@
 
 namespace ResolvExpr {
+	class TypeEnvironment;
+
 	// combos: takes a list of sets and returns a set of lists representing every possible way of forming a list by
 	// picking one element out of each set