diff --git a/src/core/include/mp-units/framework/representation_concepts.h b/src/core/include/mp-units/framework/representation_concepts.h
index 3d2cfbf5..69668c74 100644
--- a/src/core/include/mp-units/framework/representation_concepts.h
+++ b/src/core/include/mp-units/framework/representation_concepts.h
@@ -44,12 +44,7 @@ namespace mp_units {
 namespace detail {
 
 template<typename T>
-concept WeaklyRegular =
-#ifndef MP_UNITS_XCODE15_HACKS
-  true;
-#else
-  std::copyable<T> && std::equality_comparable<T>;
-#endif
+concept WeaklyRegular = std::copyable<T> && std::equality_comparable<T>;
 
 template<typename T, typename S>
 concept ScalableWith = requires(const T v, const S s) {
@@ -175,13 +170,18 @@ template<typename T>
 concept ComplexScalar =
   // TODO should the below be provided?
   // (!disable_complex<T>) &&
-  Addable<T> && ScalableWith<T, T> && requires(const T v, const T& ref) {
+  Addable<T> && ScalableWith<T, T> &&
+  requires(const T v, const T& ref) {
     ::mp_units::real(v);
     ::mp_units::imag(v);
     ::mp_units::modulus(v);
     requires ScalableWith<T, decltype(::mp_units::modulus(v))>;
     requires std::constructible_from<T, decltype(::mp_units::real(ref)), decltype(::mp_units::imag(ref))>;
-  } && WeaklyRegular<T>;
+  }
+#ifndef MP_UNITS_XCODE15_HACKS
+  && WeaklyRegular<T>
+#endif
+  ;
 
 }  // namespace detail
 
@@ -197,8 +197,12 @@ MP_UNITS_INLINE constexpr bool disable_real<bool> = true;
 namespace detail {
 
 template<typename T>
-concept RealScalar = (!disable_real<T>) && Addable<T> && ScalableWith<T, T> && std::totally_ordered<T> &&
-                     (!ComplexScalar<T>) && WeaklyRegular<T>;
+concept RealScalar =
+  (!disable_real<T>) && Addable<T> && ScalableWith<T, T> && std::totally_ordered<T> && (!ComplexScalar<T>)
+#if MP_UNITS_COMP_GCC != 12 && !defined(MP_UNITS_XCODE15_HACKS)
+  && WeaklyRegular<T>
+#endif
+  ;
 
 template<typename T>
 concept Scalar = RealScalar<T> || ComplexScalar<T>;
@@ -250,15 +254,20 @@ MP_UNITS_EXPORT inline constexpr ::mp_units::detail::magnitude_impl::magnitude_t
 namespace detail {
 
 template<typename T>
-concept Vector = Addable<T> && requires(const T v) {
-  ::mp_units::magnitude(v);
-  requires ScalableWith<T, decltype(::mp_units::magnitude(v))>;
-  // TODO should we also check for the below (e.g., when `size() > 1` or `2`)
-  // ::mp_units::zero_vector<T>();
-  // ::mp_units::scalar_product(a, b);
-  // ::mp_units::vector_product(a, b);
-  // ::mp_units::tensor_product(a, b);
-} && WeaklyRegular<T>;
+concept Vector = Addable<T> &&
+                 requires(const T v) {
+                   ::mp_units::magnitude(v);
+                   requires ScalableWith<T, decltype(::mp_units::magnitude(v))>;
+                   // TODO should we also check for the below (e.g., when `size() > 1` or `2`)
+                   // ::mp_units::zero_vector<T>();
+                   // ::mp_units::scalar_product(a, b);
+                   // ::mp_units::vector_product(a, b);
+                   // ::mp_units::tensor_product(a, b);
+                 }
+#ifndef MP_UNITS_XCODE15_HACKS
+                 && WeaklyRegular<T>
+#endif
+  ;
 
 }  // namespace detail