diff --git a/include/boost/parser/replace.hpp b/include/boost/parser/replace.hpp
index 2db07a89..d7f588eb 100644
--- a/include/boost/parser/replace.hpp
+++ b/include/boost/parser/replace.hpp
@@ -699,8 +699,8 @@ constexpr bool std::ranges::enable_borrowed_range<boost::parser::replace_view<
     Parser,
     GlobalState,
     ErrorHandler,
-    SkipParser>> =
-    enable_borrowed_range<V> && enable_borrowed_range<ReplacementV>;
+    SkipParser>> = std::ranges::enable_borrowed_range<V> &&
+    std::ranges::enable_borrowed_range<ReplacementV>;
 #endif
 
 #endif
diff --git a/include/boost/parser/search.hpp b/include/boost/parser/search.hpp
index 3df2a567..aab10373 100644
--- a/include/boost/parser/search.hpp
+++ b/include/boost/parser/search.hpp
@@ -667,7 +667,7 @@ template<
 constexpr bool std::ranges::enable_borrowed_range<
     boost::parser::
         search_all_view<V, Parser, GlobalState, ErrorHandler, SkipParser>> =
-    enable_borrowed_range<V>;
+    std::ranges::enable_borrowed_range<V>;
 #endif
 
 #endif
diff --git a/include/boost/parser/split.hpp b/include/boost/parser/split.hpp
index 31a5ce72..205858cc 100644
--- a/include/boost/parser/split.hpp
+++ b/include/boost/parser/split.hpp
@@ -393,7 +393,7 @@ template<
 constexpr bool std::ranges::enable_borrowed_range<
     boost::parser::
         split_view<V, Parser, GlobalState, ErrorHandler, SkipParser>> =
-    enable_borrowed_range<V>;
+    std::ranges::enable_borrowed_range<V>;
 #endif
 
 #endif
diff --git a/include/boost/parser/transform_replace.hpp b/include/boost/parser/transform_replace.hpp
index e4b6b616..c271f71a 100644
--- a/include/boost/parser/transform_replace.hpp
+++ b/include/boost/parser/transform_replace.hpp
@@ -10,6 +10,10 @@ namespace boost::parser {
 
     namespace detail {
 
+        template<typename F>
+        constexpr bool tidy_func = std::is_trivially_copyable_v<F> &&
+                                   sizeof(F) <= sizeof(void *) * 2;
+
         template<typename I, typename S, typename Parser>
         using attr_type = decltype(std::declval<Parser const &>().call(
             std::bool_constant<false>{},
@@ -342,7 +346,7 @@ namespace boost::parser {
               ErrorHandler,
               SkipParser>>
     {
-        //private:
+    private:
         using attr_t = detail::range_attr_t<V, Parser>;
         using replacement_range = std::invoke_result_t<F &, attr_t>;
 
@@ -813,8 +817,7 @@ namespace boost::parser {
 #endif
 }
 
-// TODO: Conditional borrowability.
-#if 0 // BOOST_PARSER_USE_CONCEPTS
+#if BOOST_PARSER_USE_CONCEPTS
 template<
     typename V,
     typename F,
@@ -822,14 +825,16 @@ template<
     typename GlobalState,
     typename ErrorHandler,
     typename SkipParser>
-constexpr bool std::ranges::enable_borrowed_range<boost::parser::replace_view<
-    V,
-    F,
-    Parser,
-    GlobalState,
-    ErrorHandler,
-    SkipParser>> =
-    enable_borrowed_range<V> && enable_borrowed_range<F>;
+constexpr bool
+    std::ranges::enable_borrowed_range<boost::parser::transform_replace_view<
+        V,
+        F,
+        Parser,
+        GlobalState,
+        ErrorHandler,
+        SkipParser>> = std::ranges::enable_borrowed_range<V> &&
+                       (std::ranges::enable_borrowed_range<F> ||
+                        boost::parser::detail::tidy_func<F>);
 #endif
 
 #endif