diff --git a/tools/quake3/q3map2/autopk3.cpp b/tools/quake3/q3map2/autopk3.cpp
index 0317872d..570d5438 100644
--- a/tools/quake3/q3map2/autopk3.cpp
+++ b/tools/quake3/q3map2/autopk3.cpp
@@ -107,7 +107,7 @@ static void parseBspFile( const char *bspPath, StrList& outShaders, StrList& out
 		}
 
 		for ( size_t i = 0; i < bspShaders.size(); ++i ){
-			if ( drawsurfSHs[i] && !( bspShaders[i].surfaceFlags & GetRequiredSurfaceParm( "nodraw"_Tstring ).surfaceFlags ) ){ // also sort out nodraw patches
+			if ( drawsurfSHs[i] && !( bspShaders[i].surfaceFlags & GetRequiredSurfaceParm< "nodraw"_Tstring >().surfaceFlags ) ){ // also sort out nodraw patches
 				res2list( pk3Shaders, bspShaders[i].shader );
 			}
 		}
diff --git a/tools/quake3/q3map2/convert_map.cpp b/tools/quake3/q3map2/convert_map.cpp
index 855a04f9..cf566d35 100644
--- a/tools/quake3/q3map2/convert_map.cpp
+++ b/tools/quake3/q3map2/convert_map.cpp
@@ -340,7 +340,7 @@ static void ConvertBrush( FILE *f, int bspBrushNum, const Vector3& origin, bool
 
 	/* find out if brush is detail */
 	int contentFlag = 0;
-	if( !( bspShaders[bspBrushes[bspBrushNum].shaderNum].contentFlags & GetRequiredSurfaceParm( "structural"_Tstring ).contentFlags ) ){ // sort out structural transparent brushes, e.g. hints
+	if( !( bspShaders[bspBrushes[bspBrushNum].shaderNum].contentFlags & GetRequiredSurfaceParm< "structural"_Tstring >().contentFlags ) ){ // sort out structural transparent brushes, e.g. hints
 		for( const auto& leaf : bspLeafs ){
 			if( leaf.cluster >= 0 )
 				for( auto id = bspLeafBrushes.cbegin() + leaf.firstBSPLeafBrush, end = id + leaf.numBSPLeafBrushes; id != end; ++id ){
diff --git a/tools/quake3/q3map2/map.cpp b/tools/quake3/q3map2/map.cpp
index 485b0dd6..ab86d83d 100644
--- a/tools/quake3/q3map2/map.cpp
+++ b/tools/quake3/q3map2/map.cpp
@@ -496,10 +496,10 @@ static void SetBrushContents( brush_t& b ){
 		else if ( s->compileFlags & C_FOG ){
 			b.contentShader = s->shaderInfo;
 		}
-		else if ( b.contentShader->contentFlags & GetRequiredSurfaceParm( "playerclip"_Tstring ).contentFlags ){
+		else if ( b.contentShader->contentFlags & GetRequiredSurfaceParm< "playerclip"_Tstring >().contentFlags ){
 			continue;
 		}
-		else if ( s->contentFlags & GetRequiredSurfaceParm( "playerclip"_Tstring ).contentFlags ){
+		else if ( s->contentFlags & GetRequiredSurfaceParm< "playerclip"_Tstring >().contentFlags ){
 			b.contentShader = s->shaderInfo;
 		}
 		else if (!( b.contentShader->compileFlags & C_SOLID )){
diff --git a/tools/quake3/q3map2/q3map2.h b/tools/quake3/q3map2/q3map2.h
index dce4e555..fd41d008 100644
--- a/tools/quake3/q3map2/q3map2.h
+++ b/tools/quake3/q3map2/q3map2.h
@@ -67,6 +67,9 @@
 #include "bitflags.h"
 #include <list>
 #include <forward_list>
+#include <array>
+#include <algorithm>
+#include <cassert>
 #include "qmath.h"
 
 #include <cstddef>
@@ -1664,16 +1667,22 @@ bool                        ApplySurfaceParm( const char *name, int *contentFlag
 const surfaceParm_t         *GetSurfaceParm( const char *name );
 
 // Encode the string as a type
-template <char... chars>
-using TemplateString = std::integer_sequence<char, chars...>;
-// Create a user defined literal operator
-template <typename T, T... chars>
-constexpr TemplateString<chars...> operator""_Tstring() { return { }; }
+template <std::size_t N>
+struct TemplateString
+{
+	consteval TemplateString(const char(&s)[N]) {
+		std::copy_n(s, N, m_data.begin());
+		assert(s[N - 1] == '\0' && "TemplateString must be null-terminated"); // consteval ensures this is evaluated at compile time, despite not being a static_assert
+	}
+	auto operator<=>(const TemplateString&) const& = default;
+	std::array<char, N> m_data;
+};
+
+template<TemplateString s> constexpr auto operator ""_Tstring() { return s; }
 /// \brief returns statically evaluated \c surfaceParm_t for the given name or emits \c Error
-template<char... chars>
-const surfaceParm_t         &GetRequiredSurfaceParm( const TemplateString<chars...> ){
-    static constexpr char str[sizeof...(chars) + 1] = { chars..., '\0' }; // Recover the character data
-	static const surfaceParm_t *const sp = GetSurfaceParm( str );
+template<TemplateString s>
+const surfaceParm_t         &GetRequiredSurfaceParm(){
+	static const surfaceParm_t *const sp = GetSurfaceParm( s.m_data.data() ); // null-termination ensured in constructor
 	ENSURE( sp != nullptr );
     return *sp;
 }
diff --git a/tools/quake3/q3map2/surface_meta.cpp b/tools/quake3/q3map2/surface_meta.cpp
index 287e97be..7be0b9cd 100644
--- a/tools/quake3/q3map2/surface_meta.cpp
+++ b/tools/quake3/q3map2/surface_meta.cpp
@@ -382,7 +382,7 @@ static void TriangulatePatchSurface( const entity_t& e, mapDrawSurface_t *ds ){
 	memcpy( dsNew, ds, sizeof( *ds ) );
 
 	/* if the patch is nonsolid, then discard it */
-	if ( !( ds->shaderInfo->compileFlags & C_SOLID ) && !( ds->shaderInfo->contentFlags & GetRequiredSurfaceParm( "playerclip"_Tstring ).contentFlags ) ) {
+	if ( !( ds->shaderInfo->compileFlags & C_SOLID ) && !( ds->shaderInfo->contentFlags & GetRequiredSurfaceParm< "playerclip"_Tstring >().contentFlags ) ) {
 		ClearSurface( ds );
 	}