Index: src/Common/utility.h
===================================================================
--- src/Common/utility.h	(revision 26e6d88330fa1b4ee76973462b515711b5128930)
+++ src/Common/utility.h	(revision 4b60b28a509465482462d1373480a66293905b1a)
@@ -10,6 +10,6 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Mon Apr 25 14:26:00 2022
-// Update Count     : 51
+// Last Modified On : Thr Feb 16 12:35:00 2023
+// Update Count     : 52
 //
 
@@ -49,27 +49,4 @@
 		return 0;
 	} // if
-}
-
-template< typename T, typename U >
-struct maybeBuild_t {
-	static T * doit( const U *orig ) {
-		if ( orig ) {
-			return orig->build();
-		} else {
-			return 0;
-		} // if
-	}
-};
-
-template< typename T, typename U >
-static inline T * maybeBuild( const U *orig ) {
-	return maybeBuild_t<T,U>::doit(orig);
-}
-
-template< typename T, typename U >
-static inline T * maybeMoveBuild( const U *orig ) {
-	T* ret = maybeBuild<T>(orig);
-	delete orig;
-	return ret;
 }
 
Index: src/Parser/ParseNode.h
===================================================================
--- src/Parser/ParseNode.h	(revision 26e6d88330fa1b4ee76973462b515711b5128930)
+++ src/Parser/ParseNode.h	(revision 4b60b28a509465482462d1373480a66293905b1a)
@@ -27,5 +27,6 @@
 #include "Common/SemanticError.h"  // for SemanticError
 #include "Common/UniqueName.h"     // for UniqueName
-#include "Common/utility.h"        // for maybeClone, maybeBuild
+#include "Common/utility.h"        // for maybeClone
+#include "Parser/parserutility.h"  // for maybeBuild
 #include "SynTree/LinkageSpec.h"   // for Spec
 #include "SynTree/Declaration.h"   // for Aggregate
Index: src/Parser/parserutility.h
===================================================================
--- src/Parser/parserutility.h	(revision 26e6d88330fa1b4ee76973462b515711b5128930)
+++ src/Parser/parserutility.h	(revision 4b60b28a509465482462d1373480a66293905b1a)
@@ -5,11 +5,11 @@
 // file "LICENCE" distributed with Cforall.
 //
-// parserutility.h -- 
+// parserutility.h -- Collected utilities for the parser.
 //
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 15:31:46 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 22 09:32:58 2017
-// Update Count     : 4
+// Last Modified By : Andrew Beach
+// Last Modified On : Thr Feb 16 12:34:00 2023
+// Update Count     : 5
 //
 
@@ -20,4 +20,27 @@
 Expression *notZeroExpr( Expression *orig );
 
+template< typename T, typename U >
+struct maybeBuild_t {
+	static T * doit( const U *orig ) {
+		if ( orig ) {
+			return orig->build();
+		} else {
+			return 0;
+		}
+	}
+};
+
+template< typename T, typename U >
+static inline T * maybeBuild( const U *orig ) {
+	return maybeBuild_t<T,U>::doit(orig);
+}
+
+template< typename T, typename U >
+static inline T * maybeMoveBuild( const U *orig ) {
+	T* ret = maybeBuild<T>(orig);
+	delete orig;
+	return ret;
+}
+
 // Local Variables: //
 // tab-width: 4 //