diff --git a/src/core/include/mp_units/bits/dimension_concepts.h b/src/core/include/mp_units/bits/dimension_concepts.h
index 0a1469fd..a3726370 100644
--- a/src/core/include/mp_units/bits/dimension_concepts.h
+++ b/src/core/include/mp_units/bits/dimension_concepts.h
@@ -56,11 +56,12 @@ concept BaseDimension =
 namespace detail {
 
 template<typename T>
-inline constexpr bool is_dimension_one = false;
+struct is_dimension_one : std::false_type {};
 
 template<typename T>
 inline constexpr bool is_power_of_dim = requires {
-  requires is_specialization_of_power<T> && (BaseDimension<typename T::factor> || is_dimension_one<typename T::factor>);
+  requires is_specialization_of_power<T> &&
+             (BaseDimension<typename T::factor> || is_dimension_one<typename T::factor>::value);
 };
 
 template<typename T>
@@ -68,13 +69,13 @@ inline constexpr bool is_per_of_dims = false;
 
 template<typename... Ts>
 inline constexpr bool is_per_of_dims<per<Ts...>> =
-  (... && (BaseDimension<Ts> || is_dimension_one<Ts> || is_power_of_dim<Ts>));
+  (... && (BaseDimension<Ts> || is_dimension_one<Ts>::value || is_power_of_dim<Ts>));
 
 }  // namespace detail
 
 template<typename T>
 concept DerivedDimensionExpr =
-  BaseDimension<T> || detail::is_dimension_one<T> || detail::is_power_of_dim<T> || detail::is_per_of_dims<T>;
+  BaseDimension<T> || detail::is_dimension_one<T>::value || detail::is_power_of_dim<T> || detail::is_per_of_dims<T>;
 
 template<DerivedDimensionExpr... Expr>
 struct derived_dimension;
diff --git a/src/core/include/mp_units/bits/expression_template.h b/src/core/include/mp_units/bits/expression_template.h
index b4f74ee9..76bebb2a 100644
--- a/src/core/include/mp_units/bits/expression_template.h
+++ b/src/core/include/mp_units/bits/expression_template.h
@@ -291,7 +291,7 @@ struct expr_fractions_result {
   using _den_ = Den;  // exposition only
 };
 
-template<typename OneTypeBase, typename List>
+template<template<typename> typename OneType, typename List>
 [[nodiscard]] consteval auto expr_fractions_impl()
 {
   constexpr std::size_t size = type_list_size<List>;
@@ -304,7 +304,7 @@ template<typename OneTypeBase, typename List>
     using last_element = type_list_back<List>;
 
     if constexpr (is_specialization_of_per<last_element>) {
-      if constexpr (size == 2 && std::derived_from<type_list_front<List>, OneTypeBase>)
+      if constexpr (size == 2 && OneType<type_list_front<List>>::value)
         return expr_fractions_result<type_list<>, type_list_map<last_element, type_list>>{};
       else {
         using split = type_list_split<List, size - 1>;
@@ -319,8 +319,8 @@ template<typename OneTypeBase, typename List>
 /**
  * @brief Divides expression template spec to numerator and denominator parts
  */
-template<typename OneTypeBase, typename... Ts>
-struct expr_fractions : decltype(expr_fractions_impl<OneTypeBase, type_list<Ts...>>()) {};
+template<template<typename> typename OneType, typename... Ts>
+struct expr_fractions : decltype(expr_fractions_impl<OneType, type_list<Ts...>>()) {};
 
 // expr_make_spec
 template<typename NumList, typename DenList, typename OneType, template<typename...> typename To>
diff --git a/src/core/include/mp_units/bits/quantity_spec_concepts.h b/src/core/include/mp_units/bits/quantity_spec_concepts.h
index eb158585..00e16e89 100644
--- a/src/core/include/mp_units/bits/quantity_spec_concepts.h
+++ b/src/core/include/mp_units/bits/quantity_spec_concepts.h
@@ -88,12 +88,12 @@ concept BaseQuantitySpec =
 namespace detail {
 
 template<typename T>
-inline constexpr bool is_dimensionless = false;
+struct is_dimensionless : std::false_type {};
 
 template<typename T>
 inline constexpr bool is_power_of_quantity_spec = requires {
   requires is_specialization_of_power<T> &&
-             (NamedQuantitySpec<typename T::factor> || is_dimensionless<typename T::factor>);
+             (NamedQuantitySpec<typename T::factor> || is_dimensionless<typename T::factor>::value);
 };
 
 template<typename T>
@@ -101,16 +101,17 @@ inline constexpr bool is_per_of_quantity_specs = false;
 
 template<typename... Ts>
 inline constexpr bool is_per_of_quantity_specs<per<Ts...>> =
-  (... && (NamedQuantitySpec<Ts> || is_dimensionless<Ts> || is_power_of_quantity_spec<Ts>));
+  (... && (NamedQuantitySpec<Ts> || is_dimensionless<Ts>::value || is_power_of_quantity_spec<Ts>));
 
 }  // namespace detail
 
 template<typename T>
-concept DerivedQuantitySpecExpr = detail::NamedQuantitySpec<T> || detail::is_dimensionless<T> ||
-                                  detail::is_power_of_quantity_spec<T> || detail::is_per_of_quantity_specs<T>;
+concept IntermediateDerivedQuantitySpecExpr =
+  detail::NamedQuantitySpec<T> || detail::is_dimensionless<T>::value || detail::is_power_of_quantity_spec<T> ||
+  detail::is_per_of_quantity_specs<T>;
 
 
-template<DerivedQuantitySpecExpr... Expr>
+template<IntermediateDerivedQuantitySpecExpr... Expr>
 struct derived_quantity_spec;
 
 namespace detail {
diff --git a/src/core/include/mp_units/dimension.h b/src/core/include/mp_units/dimension.h
index 231c995b..9afe1f2e 100644
--- a/src/core/include/mp_units/dimension.h
+++ b/src/core/include/mp_units/dimension.h
@@ -115,7 +115,7 @@ using type_list_of_base_dimension_less = expr_less<T1, T2, base_dimension_less>;
  *       instantiate this type automatically based on the dimensional arithmetic equation provided by the user.
  */
 template<DerivedDimensionExpr... Expr>
-struct derived_dimension : detail::expr_fractions<derived_dimension<>, Expr...> {};
+struct derived_dimension : detail::expr_fractions<detail::is_dimension_one, Expr...> {};
 
 /**
  * @brief Dimension one
@@ -130,7 +130,7 @@ inline constexpr struct dimension_one : derived_dimension<> {
 namespace detail {
 
 template<>
-inline constexpr bool is_dimension_one<struct dimension_one> = true;
+struct is_dimension_one<struct dimension_one> : std::true_type {};
 
 }  // namespace detail
 
diff --git a/src/core/include/mp_units/unit.h b/src/core/include/mp_units/unit.h
index d1552de9..9d3c353a 100644
--- a/src/core/include/mp_units/unit.h
+++ b/src/core/include/mp_units/unit.h
@@ -219,6 +219,13 @@ struct prefixed_unit : std::remove_const_t<decltype(M * U)> {
   static constexpr auto symbol = Symbol + U.symbol;
 };
 
+namespace detail {
+
+template<typename T>
+struct is_one : std::false_type {};
+
+}  // namespace detail
+
 /**
  * @brief Measurement unit for a derived quantity
  *
@@ -265,7 +272,7 @@ struct prefixed_unit : std::remove_const_t<decltype(M * U)> {
  *       instantiate this type automatically based on the unit arithmetic equation provided by the user.
  */
 template<DerivedUnitExpr... Expr>
-struct derived_unit : detail::expr_fractions<derived_unit<>, Expr...> {};
+struct derived_unit : detail::expr_fractions<detail::is_one, Expr...> {};
 
 /**
  * @brief Unit one
@@ -278,6 +285,9 @@ inline constexpr struct one : derived_unit<> {} one;
 
 namespace detail {
 
+template<>
+struct is_one<struct one> : std::true_type {};
+
 /**
  * @brief A canonical representation of a unit
  *