diff --git a/src/Hash.cc b/src/Hash.cc
index 0e679296b0..5c90ebd592 100644
--- a/src/Hash.cc
+++ b/src/Hash.cc
@@ -27,21 +27,20 @@ alignas(16) unsigned long long KeyedHash::shared_siphash_key[2];
 
 // we use the following lines to not pull in the highwayhash headers in Hash.h - but to check the
 // types did not change underneath us.
-static_assert(std::is_same<hash64_t, highwayhash::HHResult64>::value,
+static_assert(std::is_same_v<hash64_t, highwayhash::HHResult64>,
               "Highwayhash return values must match hash_x_t");
-static_assert(std::is_same<hash128_t, highwayhash::HHResult128>::value,
+static_assert(std::is_same_v<hash128_t, highwayhash::HHResult128>,
               "Highwayhash return values must match hash_x_t");
-static_assert(std::is_same<hash256_t, highwayhash::HHResult256>::value,
+static_assert(std::is_same_v<hash256_t, highwayhash::HHResult256>,
               "Highwayhash return values must match hash_x_t");
 
 void KeyedHash::InitializeSeeds(const std::array<uint32_t, SEED_INIT_SIZE>& seed_data)
 	{
-	static_assert(std::is_same<decltype(KeyedHash::shared_siphash_key),
-	                           highwayhash::SipHashState::Key>::value,
-	              "Highwayhash Key is not unsigned long long[2]");
 	static_assert(
-		std::is_same<decltype(KeyedHash::shared_highwayhash_key), highwayhash::HHKey>::value,
-		"Highwayhash HHKey is not uint64_t[4]");
+		std::is_same_v<decltype(KeyedHash::shared_siphash_key), highwayhash::SipHashState::Key>,
+		"Highwayhash Key is not unsigned long long[2]");
+	static_assert(std::is_same_v<decltype(KeyedHash::shared_highwayhash_key), highwayhash::HHKey>,
+	              "Highwayhash HHKey is not uint64_t[4]");
 	if ( seeds_initialized )
 		return;
 
diff --git a/src/probabilistic/Hasher.cc b/src/probabilistic/Hasher.cc
index 5b20222d10..c8560fd5ed 100644
--- a/src/probabilistic/Hasher.cc
+++ b/src/probabilistic/Hasher.cc
@@ -108,7 +108,7 @@ UHF::UHF(Hasher::seed_t arg_seed)
 // times.
 Hasher::digest UHF::hash(const void* x, size_t n) const
 	{
-	static_assert(std::is_same<highwayhash::SipHashState::Key, decltype(seed.h)>::value,
+	static_assert(std::is_same_v<highwayhash::SipHashState::Key, decltype(seed.h)>,
 	              "Seed value is not the same type as highwayhash key");
 	return highwayhash::SipHash(seed.h, reinterpret_cast<const char*>(x), n);
 	}
diff --git a/src/threading/BasicThread.cc b/src/threading/BasicThread.cc
index 99116786d5..3146533610 100644
--- a/src/threading/BasicThread.cc
+++ b/src/threading/BasicThread.cc
@@ -49,7 +49,7 @@ void BasicThread::SetName(const char* arg_name)
 void BasicThread::SetOSName(const char* arg_name)
 	{
 	// Do it only if libc++ supports pthread_t.
-	if constexpr ( std::is_same<std::thread::native_handle_type, pthread_t>::value )
+	if constexpr ( std::is_same_v<std::thread::native_handle_type, pthread_t> )
 		zeek::util::detail::set_thread_name(arg_name,
 		                                    reinterpret_cast<pthread_t>(thread.native_handle()));
 	}