diff --git a/include/boost/parser/detail/detection.hpp b/include/boost/parser/detail/detection.hpp
index 1b0efacb..4e9a1765 100644
--- a/include/boost/parser/detail/detection.hpp
+++ b/include/boost/parser/detail/detection.hpp
@@ -1,10 +1,15 @@
+// Copyright (C) 2020 T. Zachary Laine
+//
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
 #ifndef BOOST_PARSER_DETAIL_DETECTION_HPP
 #define BOOST_PARSER_DETAIL_DETECTION_HPP
 
 #include <type_traits>
 
 
-namespace boost { namespace parser { namespace detail {
+namespace boost::parser::detail {
 
     template<typename...>
     struct void_
@@ -16,6 +21,24 @@ namespace boost { namespace parser { namespace detail {
     template<typename... T>
     using void_t = typename void_<T...>::type;
 
+    template<typename T>
+    struct fixup_ptr
+    {
+        using type = T;
+    };
+
+    template<typename T>
+    using remove_v_t = typename std::remove_volatile<T>::type;
+
+    template<typename T>
+    struct fixup_ptr<T *>
+    {
+        using type = remove_v_t<T> const *;
+    };
+
+    template<typename T>
+    using fixup_ptr_t = typename fixup_ptr<T>::type;
+
     template<typename T>
     using remove_cv_ref_t =
         typename std::remove_cv<typename std::remove_reference<T>::type>::type;
@@ -26,8 +49,7 @@ namespace boost { namespace parser { namespace detail {
     template<
         typename Default,
         typename AlwaysVoid,
-        template<typename...>
-        class Template,
+        template<typename...> class Template,
         typename... Args>
     struct detector
     {
@@ -37,8 +59,7 @@ namespace boost { namespace parser { namespace detail {
 
     template<
         typename Default,
-        template<typename...>
-        class Template,
+        template<typename...> class Template,
         typename... Args>
     struct detector<Default, void_t<Template<Args...>>, Template, Args...>
     {
@@ -50,18 +71,20 @@ namespace boost { namespace parser { namespace detail {
     using is_detected =
         typename detector<nonesuch, void, Template, Args...>::value_t;
 
+    template<template<typename...> class Template, typename... Args>
+    constexpr bool is_detected_v = is_detected<Template, Args...>::value;
+
     template<template<typename...> class Template, typename... Args>
     using detected_t =
         typename detector<nonesuch, void, Template, Args...>::type;
 
     template<
         typename Default,
-        template<typename...>
-        class Template,
+        template<typename...> class Template,
         typename... Args>
-    using detected_or =
+    using detected_or_t =
         typename detector<Default, void, Template, Args...>::type;
 
-}}}
+}
 
 #endif
diff --git a/include/boost/parser/detail/hl.hpp b/include/boost/parser/detail/hl.hpp
index 413fea45..b44e326a 100644
--- a/include/boost/parser/detail/hl.hpp
+++ b/include/boost/parser/detail/hl.hpp
@@ -196,7 +196,7 @@ namespace boost { namespace parser { namespace detail::hl {
         template<typename T, typename U>
         constexpr bool operator()(T const & t, U const & u)
         {
-            if constexpr (detail::is_detected<comparable, T, U>::value) {
+            if constexpr (detail::is_detected_v<comparable, T, U>) {
                 return t == u;
             } else {
                 return false;
diff --git a/include/boost/parser/detail/printing.hpp b/include/boost/parser/detail/printing.hpp
index 5bf56489..39225e5f 100644
--- a/include/boost/parser/detail/printing.hpp
+++ b/include/boost/parser/detail/printing.hpp
@@ -407,7 +407,7 @@ namespace boost { namespace parser { namespace detail {
     using streamable =
         decltype(std::declval<std::ostream &>() << std::declval<T const &>());
 
-    template<typename T, bool Streamable = is_detected<streamable, T>{}>
+    template<typename T, bool Streamable = is_detected_v<streamable, T>>
     struct printer
     {
         std::ostream & operator()(std::ostream & os, T const &)
diff --git a/include/boost/parser/detail/stl_interfaces/view_adaptor.hpp b/include/boost/parser/detail/stl_interfaces/view_adaptor.hpp
index cc61a86e..03ca52f2 100644
--- a/include/boost/parser/detail/stl_interfaces/view_adaptor.hpp
+++ b/include/boost/parser/detail/stl_interfaces/view_adaptor.hpp
@@ -9,7 +9,7 @@
 #include <boost/parser/detail/stl_interfaces/config.hpp>
 #include <boost/parser/detail/stl_interfaces/detail/view_closure.hpp>
 
-#include <boost/parser/detail/text/detail/detection.hpp>
+#include <boost/parser/detail/detection.hpp>
 
 #include <tuple>
 #include <type_traits>
@@ -50,10 +50,6 @@
 
 namespace boost::parser::detail { namespace stl_interfaces {
     namespace detail {
-        template<template<typename...> class Template, typename... Args>
-        constexpr bool is_detected_v =
-            text::detail::is_detected<Template, Args...>::value;
-
         template<typename F, typename... Args>
         using invocable_expr =
             decltype(std::declval<F>()(std::declval<Args>()...));
diff --git a/include/boost/parser/detail/text/detail/algorithm.hpp b/include/boost/parser/detail/text/detail/algorithm.hpp
index 07e1c4c4..77f86571 100644
--- a/include/boost/parser/detail/text/detail/algorithm.hpp
+++ b/include/boost/parser/detail/text/detail/algorithm.hpp
@@ -7,7 +7,7 @@
 #define BOOST_PARSER_DETAIL_TEXT_DETAIL_ALGORITHM_HPP
 
 #include <boost/parser/detail/text/concepts.hpp>
-#include <boost/parser/detail/text/detail/detection.hpp>
+#include <boost/parser/detail/detection.hpp>
 #include <boost/parser/detail/text/detail/iterator.hpp>
 
 #include <numeric>
diff --git a/include/boost/parser/detail/text/detail/begin_end.hpp b/include/boost/parser/detail/text/detail/begin_end.hpp
index ec469d4c..773dfda6 100644
--- a/include/boost/parser/detail/text/detail/begin_end.hpp
+++ b/include/boost/parser/detail/text/detail/begin_end.hpp
@@ -6,7 +6,7 @@
 #ifndef BOOST_PARSER_DETAIL_TEXT_BEGIN_END_HPP
 #define BOOST_PARSER_DETAIL_TEXT_BEGIN_END_HPP
 
-#include <boost/parser/detail/text/detail/detection.hpp>
+#include <boost/parser/detail/detection.hpp>
 
 #include <initializer_list>
 
@@ -35,10 +35,9 @@ namespace boost::parser::detail { namespace text { namespace detail {
         template<typename T>
         using adl_begin_expr = decltype(begin(std::declval<T &>()));
         template<typename T>
-        constexpr bool has_member_begin_v =
-            is_detected<member_begin_expr, T>::value;
+        constexpr bool has_member_begin_v = is_detected_v<member_begin_expr, T>;
         template<typename T>
-        constexpr bool has_adl_begin_v = is_detected<adl_begin_expr, T>::value;
+        constexpr bool has_adl_begin_v = is_detected_v<adl_begin_expr, T>;
 
         template<typename R>
         using member_return_t =
@@ -99,10 +98,9 @@ namespace boost::parser::detail { namespace text { namespace detail {
         template<typename T>
         using adl_end_expr = decltype(end(std::declval<T &>()));
         template<typename T>
-        constexpr bool has_member_end_v =
-            is_detected<member_end_expr, T>::value;
+        constexpr bool has_member_end_v = is_detected_v<member_end_expr, T>;
         template<typename T>
-        constexpr bool has_adl_end_v = is_detected<adl_end_expr, T>::value;
+        constexpr bool has_adl_end_v = is_detected_v<adl_end_expr, T>;
 
         template<typename R>
         using member_return_t =
diff --git a/include/boost/parser/detail/text/detail/detection.hpp b/include/boost/parser/detail/text/detail/detection.hpp
deleted file mode 100644
index 210adc81..00000000
--- a/include/boost/parser/detail/text/detail/detection.hpp
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright (C) 2020 T. Zachary Laine
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_PARSER_DETAIL_TEXT_DETAIL_DETECTION_HPP
-#define BOOST_PARSER_DETAIL_TEXT_DETAIL_DETECTION_HPP
-
-#include <type_traits>
-
-
-namespace boost::parser::detail { namespace text { namespace detail {
-
-    template<typename...>
-    struct void_
-    {
-        using type = void;
-        static constexpr bool value = true;
-    };
-
-    template<typename... T>
-    using void_t = typename void_<T...>::type;
-
-    template<typename T>
-    struct fixup_ptr
-    {
-        using type = T;
-    };
-
-    template<typename T>
-    using remove_v_t = typename std::remove_volatile<T>::type;
-
-    template<typename T>
-    struct fixup_ptr<T *>
-    {
-        using type = remove_v_t<T> const *;
-    };
-
-    template<typename T>
-    using fixup_ptr_t = typename fixup_ptr<T>::type;
-
-    template<typename T>
-    using remove_cv_ref_t =
-        typename std::remove_cv<typename std::remove_reference<T>::type>::type;
-
-    struct nonesuch
-    {};
-
-    template<
-        typename Default,
-        typename AlwaysVoid,
-        template<typename...> class Template,
-        typename... Args>
-    struct detector
-    {
-        using value_t = std::false_type;
-        using type = Default;
-    };
-
-    template<
-        typename Default,
-        template<typename...> class Template,
-        typename... Args>
-    struct detector<Default, void_t<Template<Args...>>, Template, Args...>
-    {
-        using value_t = std::true_type;
-        using type = Template<Args...>;
-    };
-
-    template<template<typename...> class Template, typename... Args>
-    using is_detected =
-        typename detector<nonesuch, void, Template, Args...>::value_t;
-
-    template<template<typename...> class Template, typename... Args>
-    constexpr bool is_detected_v = is_detected<Template, Args...>::value;
-
-    template<template<typename...> class Template, typename... Args>
-    using detected_t =
-        typename detector<nonesuch, void, Template, Args...>::type;
-
-    template<
-        typename Default,
-        template<typename...> class Template,
-        typename... Args>
-    using detected_or_t =
-        typename detector<Default, void, Template, Args...>::type;
-
-}}}
-
-#endif
diff --git a/include/boost/parser/parser.hpp b/include/boost/parser/parser.hpp
index 9d1f841d..a64d44ae 100644
--- a/include/boost/parser/parser.hpp
+++ b/include/boost/parser/parser.hpp
@@ -748,7 +748,7 @@ namespace boost { namespace parser {
         template<
             typename Context,
             typename T,
-            bool Callable = is_detected<callable, T const &, Context const &>{}>
+            bool Callable = is_detected_v<callable, T const &, Context const &>>
         struct resolve_impl
         {
             static auto call(Context const &, T const & x) { return x; }
@@ -857,7 +857,7 @@ namespace boost { namespace parser {
 
         template<typename T, typename U>
         constexpr bool is_equality_comparable_with_v =
-            is_detected<comparison, T, U>::value;
+            is_detected_v<comparison, T, U>;
 
         template<typename T>
         struct is_nope : std::false_type
@@ -936,7 +936,7 @@ namespace boost { namespace parser {
         {};
 
         template<typename F, typename... Args>
-        constexpr bool is_invocable_v = is_detected<callable, F, Args...>::value;
+        constexpr bool is_invocable_v = is_detected_v<callable, F, Args...>;
 
 #if BOOST_PARSER_USE_CONCEPTS
 
@@ -982,8 +982,8 @@ namespace boost { namespace parser {
             std::declval<T>().end()));
 
         template<typename T>
-        constexpr bool is_container_v = is_detected<has_insert, T>::value &&
-            is_detected<has_range_insert, T>::value;
+        constexpr bool is_container_v =
+            is_detected_v<has_insert, T> && is_detected_v<has_range_insert, T>;
 
         template<typename T, typename U>
         constexpr bool container_and_value_type = is_container_v<T> &&
@@ -1008,7 +1008,7 @@ namespace boost { namespace parser {
         template<typename T>
         constexpr bool is_parsable_range_v = is_parsable_code_unit_v<
             remove_cv_ref_t<detected_t<has_begin, T>>> &&
-            is_detected<has_end, T>::value;
+            is_detected_v<has_end, T>;
 
         template<typename T>
         constexpr bool is_parsable_pointer_v =