diff --git a/include/proxy/v5/detail/core.h b/include/proxy/v5/detail/core.h
index 0a25174..e2b7f67 100644
--- a/include/proxy/v5/detail/core.h
+++ b/include/proxy/v5/detail/core.h
@@ -1567,15 +1567,10 @@ struct converter {
   struct accessor<P, D, T() oq ne> {                                           \
     PRO5D_GEN_DEBUG_SYMBOL_FOR_MEM_ACCESSOR(operator T)                        \
     explicit(Expl) operator T() oq ne {                                        \
-      if constexpr (Nullable) {                                                \
-        if (!static_cast<const P&>(*this).has_value()) {                       \
-          return nullptr;                                                      \
-        }                                                                      \
-      }                                                                        \
       return invoke<D, T() oq ne>(static_cast<P pq>(*this));                   \
     }                                                                          \
   }
-template <bool Expl, bool Nullable>
+template <bool Expl>
 struct cast_dispatch_base {
   PRO5D_DEF_ACCESSOR_TEMPLATE(
       MEM, PRO5D_DEF_CAST_ACCESSOR,
diff --git a/include/proxy/v5/detail/dispatch.h b/include/proxy/v5/detail/dispatch.h
index 98dc5c3..771676b 100644
--- a/include/proxy/v5/detail/dispatch.h
+++ b/include/proxy/v5/detail/dispatch.h
@@ -264,13 +264,13 @@ struct operator_dispatch<"[]", false> {
 #undef PRO5D_DEF_LHS_UNARY_OP_ACCESSOR
 #undef PRO5D_DEF_LHS_LEFT_OP_ACCESSOR
 
-struct implicit_conversion_dispatch : detail::cast_dispatch_base<false, false> {
+struct implicit_conversion_dispatch : detail::cast_dispatch_base<false> {
   template <class T>
   PRO5D_STATIC_CALL(T&&, T&& self) noexcept {
     return std::forward<T>(self);
   }
 };
-struct explicit_conversion_dispatch : detail::cast_dispatch_base<true, false> {
+struct explicit_conversion_dispatch : detail::cast_dispatch_base<true> {
   template <class T>
   PRO5D_STATIC_CALL(auto, T&& self) noexcept {
     return detail::converter{