diff --git a/include/fmt/base.h b/include/fmt/base.h
index 2e82c499..401cbd12 100644
--- a/include/fmt/base.h
+++ b/include/fmt/base.h
@@ -1473,7 +1473,7 @@ template <typename T>
 struct has_format_as
     : bool_constant<!std::is_same<format_as_t<T>, void>::value> {};
 
-#define FMT_MAP_API FMT_CONSTEXPR FMT_ALWAYS_INLINE
+#define FMT_MAP_API static FMT_CONSTEXPR FMT_ALWAYS_INLINE
 
 // Maps formatting arguments to reduce the set of types we need to work with.
 // Returns unformattable* on errors to be SFINAE-friendly.
@@ -1615,7 +1615,7 @@ template <typename Context> struct arg_mapper {
 // A type constant after applying arg_mapper<Context>.
 template <typename T, typename Context>
 using mapped_type_constant =
-    type_constant<decltype(arg_mapper<Context>().map(std::declval<const T&>())),
+    type_constant<decltype(arg_mapper<Context>::map(std::declval<const T&>())),
                   typename Context::char_type>;
 
 template <typename T, typename Context,
@@ -1697,7 +1697,7 @@ struct type_is_unformattable_for;
 
 template <bool PACKED, typename Context, typename T, FMT_ENABLE_IF(PACKED)>
 FMT_CONSTEXPR auto make_arg(T& val) -> value<Context> {
-  using arg_type = remove_cvref_t<decltype(arg_mapper<Context>().map(val))>;
+  using arg_type = remove_cvref_t<decltype(arg_mapper<Context>::map(val))>;
 
   // Use enum instead of constexpr because the latter may generate code.
   enum {
@@ -1725,7 +1725,7 @@ FMT_CONSTEXPR auto make_arg(T& val) -> value<Context> {
       formattable,
       "Cannot format an argument. To make type T formattable provide a "
       "formatter<T> specialization: https://fmt.dev/latest/api.html#udt");
-  return {arg_mapper<Context>().map(val)};
+  return {arg_mapper<Context>::map(val)};
 }
 
 template <typename Context, typename T>
@@ -1783,7 +1783,7 @@ struct format_arg_store {
   named_arg_info<typename Context::char_type> named_args[NUM_NAMED_ARGS];
 
   template <typename... T>
-  FMT_MAP_API format_arg_store(T&... values)
+  FMT_CONSTEXPR FMT_ALWAYS_INLINE format_arg_store(T&... values)
       : args{{named_args, NUM_NAMED_ARGS},
              make_arg<NUM_ARGS <= max_packed_args, Context>(values)...} {
     using dummy = int[];
@@ -2088,9 +2088,10 @@ template <typename Char>
 using buffered_context = basic_format_context<basic_appender<Char>, Char>;
 
 template <typename T, typename Char = char>
-using is_formattable = bool_constant<!std::is_base_of<
-    detail::unformattable, decltype(detail::arg_mapper<buffered_context<Char>>()
-                                        .map(std::declval<T&>()))>::value>;
+using is_formattable = bool_constant<
+    !std::is_base_of<detail::unformattable,
+                     decltype(detail::arg_mapper<buffered_context<Char>>::map(
+                         std::declval<T&>()))>::value>;
 
 #if FMT_USE_CONCEPTS
 template <typename T, typename Char = char>
@@ -2843,13 +2844,13 @@ FMT_VISIBILITY("hidden")  // Suppress an ld warning on macOS (#3769).
 FMT_CONSTEXPR auto parse_format_specs(parse_context<Char>& ctx)
     -> decltype(ctx.begin()) {
   using mapper = arg_mapper<buffered_context<Char>>;
-  using mapped = remove_cvref_t<decltype(mapper().map(std::declval<T&>()))>;
+  using mapped_type = remove_cvref_t<decltype(mapper::map(std::declval<T&>()))>;
 #if defined(__cpp_if_constexpr)
-  if constexpr (std::is_default_constructible<formatter<mapped, Char>>())
-    return formatter<mapped, Char>().parse(ctx);
-  return ctx.begin(); // Ignore the error - it is reported by make_format_args.
+  if constexpr (std::is_default_constructible<formatter<mapped_type, Char>>())
+    return formatter<mapped_type, Char>().parse(ctx);
+  return ctx.begin();  // Ignore the error - it is reported by make_format_args.
 #else
-  return formatter<mapped, Char>().parse(ctx);
+  return formatter<mapped_type, Char>().parse(ctx);
 #endif
 }
 
diff --git a/include/fmt/format.h b/include/fmt/format.h
index 3a69d659..fe592fb7 100644
--- a/include/fmt/format.h
+++ b/include/fmt/format.h
@@ -1081,7 +1081,7 @@ class loc_value {
   template <typename T, FMT_ENABLE_IF(!detail::is_float128<T>::value)>
   loc_value(T value) {
     value_.type_ = detail::mapped_type_constant<T, format_context>::value;
-    value_.value_ = detail::arg_mapper<format_context>().map(value);
+    value_.value_ = detail::arg_mapper<format_context>::map(value);
   }
 
   template <typename T, FMT_ENABLE_IF(detail::is_float128<T>::value)>
@@ -3648,10 +3648,10 @@ template <typename Char, typename OutputIt, typename T,
 FMT_CONSTEXPR auto write(OutputIt out, const T& value) -> enable_if_t<
     std::is_class<T>::value && !has_to_string_view<T>::value &&
         !is_floating_point<T>::value && !std::is_same<T, Char>::value &&
-        !std::is_same<T, remove_cvref_t<decltype(arg_mapper<Context>().map(
-                             value))>>::value,
+        !std::is_same<T, remove_cvref_t<
+                             decltype(arg_mapper<Context>::map(value))>>::value,
     OutputIt> {
-  return write<Char>(out, arg_mapper<Context>().map(value));
+  return write<Char>(out, arg_mapper<Context>::map(value));
 }
 
 template <typename Char, typename OutputIt, typename T,
diff --git a/include/fmt/ranges.h b/include/fmt/ranges.h
index 47d9f4aa..b402b465 100644
--- a/include/fmt/ranges.h
+++ b/include/fmt/ranges.h
@@ -369,9 +369,8 @@ template <typename Context> struct range_mapper {
   }
   template <typename T,
             FMT_ENABLE_IF(!has_formatter<remove_cvref_t<T>, Context>::value)>
-  static auto map(T&& value)
-      -> decltype(mapper().map(static_cast<T&&>(value))) {
-    return mapper().map(static_cast<T&&>(value));
+  static auto map(T&& value) -> decltype(mapper::map(static_cast<T&&>(value))) {
+    return mapper::map(static_cast<T&&>(value));
   }
 };