diff --git a/include/cuco/detail/probing_scheme_impl.inl b/include/cuco/detail/probing_scheme_impl.inl
index 4887b4c96..40b9ffd8b 100644
--- a/include/cuco/detail/probing_scheme_impl.inl
+++ b/include/cuco/detail/probing_scheme_impl.inl
@@ -100,7 +100,7 @@ __host__ __device__ constexpr auto linear_probing<CGSize, Hash>::operator()(
 {
   using size_type = typename Extent::value_type;
   return detail::probing_iterator<Extent>{
-    cuco::detail::sanitize_hash<size_type>(hash_(probe_key)) % static_cast<size_type>(upper_bound),
+    cuco::detail::sanitize_hash<size_type>(hash_(probe_key)) % upper_bound,
     1,  // step size is 1
     upper_bound};
 }
diff --git a/tests/utility/extent_test.cu b/tests/utility/extent_test.cu
index d069f4dbd..d44e20368 100644
--- a/tests/utility/extent_test.cu
+++ b/tests/utility/extent_test.cu
@@ -44,13 +44,13 @@ TEMPLATE_TEST_CASE_SIG(
   {
     auto constexpr size = cuco::experimental::extent<SizeType, num>{};
     auto constexpr res  = cuco::experimental::make_window_extent<cg_size, window_size>(size);
-    STATIC_REQUIRE(gold_reference == static_cast<SizeType>(res));
+    STATIC_REQUIRE(gold_reference == res.value());
   }
 
   SECTION("Compute dynamic valid extent at run time.")
   {
     auto const size = cuco::experimental::extent<SizeType>{num};
     auto const res  = cuco::experimental::make_window_extent<cg_size, window_size>(size);
-    REQUIRE(gold_reference == static_cast<SizeType>(res));
+    REQUIRE(gold_reference == res.value());
   }
 }