diff --git a/include/stdx/env.hpp b/include/stdx/env.hpp
index 5da6d5e..4dbd423 100644
--- a/include/stdx/env.hpp
+++ b/include/stdx/env.hpp
@@ -33,7 +33,7 @@ template <typename Q> struct has_query {
 
 template <typename... Envs> struct env {
     template <_env::valid_query_over<Envs...> Q>
-    CONSTEVAL static auto query(Q) noexcept {
+    [[nodiscard]] CONSTEVAL static auto query(Q) noexcept {
         using I = boost::mp11::mp_find_if_q<boost::mp11::mp_list<Envs...>,
                                             _env::has_query<Q>>;
         using E = nth_t<I::value, Envs...>;
diff --git a/include/stdx/span.hpp b/include/stdx/span.hpp
index 67bbcee..8c91bb2 100644
--- a/include/stdx/span.hpp
+++ b/include/stdx/span.hpp
@@ -111,12 +111,12 @@ class span : public detail::span_base<T, Extent> {
                       "Span extends beyond available storage");
     }
 
+    // NOLINTNEXTLINE(*-avoid-c-arrays)
+    template <std::size_t N> using arr_t = type_identity_t<element_type> (&)[N];
+
     template <std::size_t N>
     // NOLINTNEXTLINE(google-explicit-constructor)
-    constexpr span(
-        // NOLINTNEXTLINE(*-avoid-c-arrays)
-        stdx::type_identity_t<element_type> (&arr)[N] LIFETIMEBOUND) noexcept
-        : ptr{std::data(arr)} {
+    constexpr span(arr_t<N> arr LIFETIMEBOUND) noexcept : ptr{std::data(arr)} {
         static_assert(Extent == dynamic_extent or Extent <= N,
                       "Span extends beyond available storage");
     }
diff --git a/include/stdx/type_traits.hpp b/include/stdx/type_traits.hpp
index 03189f8..488955f 100644
--- a/include/stdx/type_traits.hpp
+++ b/include/stdx/type_traits.hpp
@@ -54,7 +54,8 @@ struct call_base {
 };
 
 template <typename, bool> struct callable_test : call_base {};
-template <typename F> struct callable_test<F, true> : F, call_base {};
+template <typename F>
+struct callable_test<F, true> : remove_cvref_t<F>, call_base {};
 
 template <typename F, typename = void> constexpr auto is_func_obj = true;
 template <typename F>
@@ -144,7 +145,7 @@ struct for_each_t<L<Vs...>> {
         (f.template operator()<Vs>(), ...);
     }
 };
-template <template <typename, auto...> typename L, typename T, T... Vs>
+template <template <typename X, X...> typename L, typename T, T... Vs>
 struct for_each_t<L<T, Vs...>> {
     template <typename F> constexpr auto operator()(F &&f) const {
         (f.template operator()<Vs>(), ...);
@@ -174,7 +175,7 @@ struct apply_sequence_t<L<Vs...>> {
         return f.template operator()<Vs...>();
     }
 };
-template <template <typename, auto...> typename L, typename T, T... Vs>
+template <template <typename X, X...> typename L, typename T, T... Vs>
 struct apply_sequence_t<L<T, Vs...>> {
     template <typename F> constexpr auto operator()(F &&f) const {
         return f.template operator()<Vs...>();
diff --git a/test/env.cpp b/test/env.cpp
index 6449b0f..8ae0727 100644
--- a/test/env.cpp
+++ b/test/env.cpp
@@ -8,13 +8,13 @@ namespace {
 [[maybe_unused]] constexpr inline struct custom_t {
     template <typename T>
         requires true // more constrained
-    CONSTEVAL auto operator()(T &&t) const
+    [[nodiscard]] CONSTEVAL auto operator()(T &&t) const
         noexcept(noexcept(std::forward<T>(t).query(std::declval<custom_t>())))
             -> decltype(std::forward<T>(t).query(*this)) {
         return std::forward<T>(t).query(*this);
     }
 
-    CONSTEVAL auto operator()(auto &&) const { return 42; }
+    [[nodiscard]] CONSTEVAL auto operator()(auto &&) const { return 42; }
 } custom;
 } // namespace