Index: src/Parser/parser.yy
===================================================================
--- src/Parser/parser.yy	(revision 0f15e3b3aebf8d0ff2af18c94c36635b87820035)
+++ src/Parser/parser.yy	(revision 7a24d7639031c51162dd47c4591e5e8c79a534cd)
@@ -10,6 +10,6 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jan 30 20:47:27 2023
-// Update Count     : 5859
+// Last Modified On : Tue Jan 31 08:55:11 2023
+// Update Count     : 5861
 //
 
@@ -2080,9 +2080,10 @@
 		{ $$ = DeclarationNode::newTypeQualifier( Type::Atomic ); }
 	| forall
+		{ $$ = DeclarationNode::newForall( $1 ); }
 	;
 
 forall:
 	FORALL '(' type_parameter_list ')'					// CFA
-		{ $$ = DeclarationNode::newForall( $3 ); }
+		{ $$ = $3; }
 	;
 
@@ -2979,10 +2980,10 @@
 	TRAIT identifier_or_type_name '(' type_parameter_list ')' '{' '}'
 		{ $$ = DeclarationNode::newTrait( $2, $4, nullptr ); }
-	| FORALL '(' type_parameter_list ')' TRAIT identifier_or_type_name '{' '}' // alternate
-		{ $$ = DeclarationNode::newTrait( $6, $3, nullptr ); }
+	| forall TRAIT identifier_or_type_name '{' '}' // alternate
+		{ $$ = DeclarationNode::newTrait( $3, $1, nullptr ); }
 	| TRAIT identifier_or_type_name '(' type_parameter_list ')' '{' push trait_declaration_list pop '}'
 		{ $$ = DeclarationNode::newTrait( $2, $4, $8 ); }
-	| FORALL '(' type_parameter_list ')' TRAIT identifier_or_type_name '{' push trait_declaration_list pop '}' // alternate
-		{ $$ = DeclarationNode::newTrait( $6, $3, $9 ); }
+	| forall TRAIT identifier_or_type_name '{' push trait_declaration_list pop '}' // alternate
+		{ $$ = DeclarationNode::newTrait( $3, $1, $6 ); }
 	;