diff --git a/static/lns/arithmetic/addition.cpp b/static/lns/arithmetic/addition.cpp
index 7fe0df9b4..e7da12349 100644
--- a/static/lns/arithmetic/addition.cpp
+++ b/static/lns/arithmetic/addition.cpp
@@ -14,10 +14,7 @@
 
 namespace sw { namespace universal {
 
-	//template<typename LnsType,
-	//	std::enable_if_t<is_lns<LnsType>, LnsType> = 0
-	//>
-	template<typename LnsType>
+	template<typename LnsType, std::enable_if_t<is_lns<LnsType>, bool> = true>
 	int VerifyAddition(bool reportTestCases) {
 		constexpr size_t nbits = LnsType::nbits;
 		//constexpr size_t rbits = LnsType::rbits;
diff --git a/static/lns/arithmetic/division.cpp b/static/lns/arithmetic/division.cpp
index 2d9269d60..d5b09821d 100644
--- a/static/lns/arithmetic/division.cpp
+++ b/static/lns/arithmetic/division.cpp
@@ -17,10 +17,7 @@ namespace sw {
 	namespace universal {
 		namespace local {
 
-			//template<typename LnsType,
-			//	std::enable_if_t<is_lns<LnsType>, LnsType> = 0
-			//>
-			template<typename LnsType>
+			template<typename LnsType, std::enable_if_t<is_lns<LnsType>, bool> = true>
 			int VerifyDivision(bool reportTestCases) {
 				constexpr size_t nbits = LnsType::nbits;
 				//constexpr size_t rbits = LnsType::rbits;
diff --git a/static/lns/arithmetic/multiplication.cpp b/static/lns/arithmetic/multiplication.cpp
index 49427e6e3..4554c6a76 100644
--- a/static/lns/arithmetic/multiplication.cpp
+++ b/static/lns/arithmetic/multiplication.cpp
@@ -17,10 +17,7 @@ namespace sw {
 	namespace universal {
 		namespace local {
 
-			//template<typename LnsType,
-			//	std::enable_if_t<is_lns<LnsType>, LnsType> = 0
-			//>
-			template<typename LnsType>
+			template<typename LnsType, std::enable_if_t<is_lns<LnsType>, bool> = true>
 			int VerifyMultiplication(bool reportTestCases) {
 				constexpr size_t nbits = LnsType::nbits;
 				//constexpr size_t rbits = LnsType::rbits;
diff --git a/static/lns/arithmetic/subtraction.cpp b/static/lns/arithmetic/subtraction.cpp
index 511c44a8a..8df657987 100644
--- a/static/lns/arithmetic/subtraction.cpp
+++ b/static/lns/arithmetic/subtraction.cpp
@@ -14,10 +14,7 @@
 
 namespace sw { namespace universal {
 
-	//template<typename LnsType,
-	//	std::enable_if_t<is_lns<LnsType>, LnsType> = 0
-	//>
-	template<typename LnsType>
+	template<typename LnsType, std::enable_if_t<is_lns<LnsType>, bool> = true>
 	int VerifySubtraction(bool reportTestCases) {
 		constexpr size_t nbits = LnsType::nbits;
 		//constexpr size_t rbits = LnsType::rbits;
diff --git a/static/lns/conversion/assignment.cpp b/static/lns/conversion/assignment.cpp
index 9f861ad54..276d6edc9 100644
--- a/static/lns/conversion/assignment.cpp
+++ b/static/lns/conversion/assignment.cpp
@@ -12,7 +12,7 @@
 namespace sw { namespace universal {
 
 	// TODO: needs a type trait to only match on lns<> type
-	template<typename LnsType>
+	template<typename LnsType, std::enable_if_t<is_lns<LnsType>, bool> = true>
 	int ValidateAssignment(bool reportTestCases) {
 		constexpr size_t nbits = LnsType::nbits;
 		constexpr size_t NR_ENCODINGS = (1ull << nbits);