Index: src/Common/utility.h
===================================================================
--- src/Common/utility.h	(revision 60089f42565ca08848d03f2778491035174aa588)
+++ src/Common/utility.h	(revision b3ac2d6b5a8e89498823601a1c476f7a8fc05d26)
@@ -9,7 +9,7 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Thu Apr 28 13:18:24 2016
-// Update Count     : 16
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Jun  8 17:33:59 2016
+// Update Count     : 22
 //
 
@@ -33,11 +33,18 @@
 }
 
+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 ) {
-	if ( orig ) {
-		return orig->build();
-	} else {
-		return 0;
-	} // if
+	return maybeBuild_t<T,U>::doit(orig);
 }