diff --git a/extras/tests/Helpers/progmem_emulation.hpp b/extras/tests/Helpers/progmem_emulation.hpp
index 4d889668..ecb9f509 100644
--- a/extras/tests/Helpers/progmem_emulation.hpp
+++ b/extras/tests/Helpers/progmem_emulation.hpp
@@ -23,7 +23,7 @@ inline uint8_t pgm_read_byte(const void* p) {
   return *reinterpret_cast<const uint8_t*>(convertFlashToPtr(p));
 }
 
-#define ARDUINOJSON_DEFINE_PROGMEM_ARRAY(type, name, value)        \
-  static type const ARDUINOJSON_CONCAT2(name, _progmem)[] = value; \
-  static type const* name = reinterpret_cast<type const*>(         \
+#define ARDUINOJSON_DEFINE_PROGMEM_ARRAY(type, name, ...)                \
+  static type const ARDUINOJSON_CONCAT2(name, _progmem)[] = __VA_ARGS__; \
+  static type const* name = reinterpret_cast<type const*>(               \
       convertPtrToFlash(ARDUINOJSON_CONCAT2(name, _progmem)));
diff --git a/src/ArduinoJson/Deserialization/DeserializationError.hpp b/src/ArduinoJson/Deserialization/DeserializationError.hpp
index 5eb93e4a..2e97a024 100644
--- a/src/ArduinoJson/Deserialization/DeserializationError.hpp
+++ b/src/ArduinoJson/Deserialization/DeserializationError.hpp
@@ -79,8 +79,8 @@ class DeserializationError {
     ARDUINOJSON_DEFINE_PROGMEM_ARRAY(char, s3, "InvalidInput");
     ARDUINOJSON_DEFINE_PROGMEM_ARRAY(char, s4, "NoMemory");
     ARDUINOJSON_DEFINE_PROGMEM_ARRAY(char, s5, "TooDeep");
-    ARDUINOJSON_DEFINE_PROGMEM_ARRAY(
-        const char*, messages, ARDUINOJSON_EXPAND6({s0, s1, s2, s3, s4, s5}));
+    ARDUINOJSON_DEFINE_PROGMEM_ARRAY(const char*, messages,
+                                     {s0, s1, s2, s3, s4, s5});
     return reinterpret_cast<const __FlashStringHelper*>(
         detail::pgm_read(messages + _code));
   }
diff --git a/src/ArduinoJson/Numbers/FloatTraits.hpp b/src/ArduinoJson/Numbers/FloatTraits.hpp
index 2a6345ee..1fff5708 100644
--- a/src/ArduinoJson/Numbers/FloatTraits.hpp
+++ b/src/ArduinoJson/Numbers/FloatTraits.hpp
@@ -51,7 +51,7 @@ struct FloatTraits<T, 8 /*64bits*/> {
   static T positiveBinaryPowerOfTen(int index) {
     ARDUINOJSON_DEFINE_PROGMEM_ARRAY(  //
         uint32_t, factors,
-        ARDUINOJSON_EXPAND18({
+        {
             0x40240000, 0x00000000,  // 1e1
             0x40590000, 0x00000000,  // 1e2
             0x40C38800, 0x00000000,  // 1e4
@@ -61,7 +61,7 @@ struct FloatTraits<T, 8 /*64bits*/> {
             0x4D384F03, 0xE93FF9F5,  // 1e64
             0x5A827748, 0xF9301D32,  // 1e128
             0x75154FDD, 0x7F73BF3C   // 1e256
-        }));
+        });
     return forge(pgm_read(factors + 2 * index),
                  pgm_read(factors + 2 * index + 1));
   }
@@ -69,7 +69,7 @@ struct FloatTraits<T, 8 /*64bits*/> {
   static T negativeBinaryPowerOfTen(int index) {
     ARDUINOJSON_DEFINE_PROGMEM_ARRAY(  //
         uint32_t, factors,
-        ARDUINOJSON_EXPAND18({
+        {
             0x3FB99999, 0x9999999A,  // 1e-1
             0x3F847AE1, 0x47AE147B,  // 1e-2
             0x3F1A36E2, 0xEB1C432D,  // 1e-4
@@ -79,7 +79,7 @@ struct FloatTraits<T, 8 /*64bits*/> {
             0x32A50FFD, 0x44F4A73D,  // 1e-64
             0x255BBA08, 0xCF8C979D,  // 1e-128
             0x0AC80628, 0x64AC6F43   // 1e-256
-        }));
+        });
     return forge(pgm_read(factors + 2 * index),
                  pgm_read(factors + 2 * index + 1));
   }
@@ -87,7 +87,7 @@ struct FloatTraits<T, 8 /*64bits*/> {
   static T negativeBinaryPowerOfTenPlusOne(int index) {
     ARDUINOJSON_DEFINE_PROGMEM_ARRAY(  //
         uint32_t, factors,
-        ARDUINOJSON_EXPAND18({
+        {
             0x3FF00000, 0x00000000,  // 1e0
             0x3FB99999, 0x9999999A,  // 1e-1
             0x3F50624D, 0xD2F1A9FC,  // 1e-3
@@ -97,7 +97,7 @@ struct FloatTraits<T, 8 /*64bits*/> {
             0x32DA53FC, 0x9631D10D,  // 1e-63
             0x25915445, 0x81B7DEC2,  // 1e-127
             0x0AFE07B2, 0x7DD78B14   // 1e-255
-        }));
+        });
     return forge(pgm_read(factors + 2 * index),
                  pgm_read(factors + 2 * index + 1));
   }
@@ -173,40 +173,40 @@ struct FloatTraits<T, 4 /*32bits*/> {
 
   static T positiveBinaryPowerOfTen(int index) {
     ARDUINOJSON_DEFINE_PROGMEM_ARRAY(uint32_t, factors,
-                                     ARDUINOJSON_EXPAND6({
+                                     {
                                          0x41200000,  // 1e1f
                                          0x42c80000,  // 1e2f
                                          0x461c4000,  // 1e4f
                                          0x4cbebc20,  // 1e8f
                                          0x5a0e1bca,  // 1e16f
                                          0x749dc5ae   // 1e32f
-                                     }));
+                                     });
     return forge(pgm_read(factors + index));
   }
 
   static T negativeBinaryPowerOfTen(int index) {
     ARDUINOJSON_DEFINE_PROGMEM_ARRAY(uint32_t, factors,
-                                     ARDUINOJSON_EXPAND6({
+                                     {
                                          0x3dcccccd,  // 1e-1f
                                          0x3c23d70a,  // 1e-2f
                                          0x38d1b717,  // 1e-4f
                                          0x322bcc77,  // 1e-8f
                                          0x24e69595,  // 1e-16f
                                          0x0a4fb11f   // 1e-32f
-                                     }));
+                                     });
     return forge(pgm_read(factors + index));
   }
 
   static T negativeBinaryPowerOfTenPlusOne(int index) {
     ARDUINOJSON_DEFINE_PROGMEM_ARRAY(uint32_t, factors,
-                                     ARDUINOJSON_EXPAND6({
+                                     {
                                          0x3f800000,  // 1e0f
                                          0x3dcccccd,  // 1e-1f
                                          0x3a83126f,  // 1e-3f
                                          0x33d6bf95,  // 1e-7f
                                          0x26901d7d,  // 1e-15f
                                          0x0c01ceb3   // 1e-31f
-                                     }));
+                                     });
     return forge(pgm_read(factors + index));
   }
 
diff --git a/src/ArduinoJson/Polyfills/pgmspace_generic.hpp b/src/ArduinoJson/Polyfills/pgmspace_generic.hpp
index 242cd11e..0903ba50 100644
--- a/src/ArduinoJson/Polyfills/pgmspace_generic.hpp
+++ b/src/ArduinoJson/Polyfills/pgmspace_generic.hpp
@@ -16,8 +16,8 @@ ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
 #if ARDUINOJSON_ENABLE_PROGMEM
 
 #  ifndef ARDUINOJSON_DEFINE_PROGMEM_ARRAY
-#    define ARDUINOJSON_DEFINE_PROGMEM_ARRAY(type, name, value) \
-      static type const name[] PROGMEM = value;
+#    define ARDUINOJSON_DEFINE_PROGMEM_ARRAY(type, name, ...) \
+      static type const name[] PROGMEM = __VA_ARGS__;
 #  endif
 
 template <typename T>
@@ -31,8 +31,8 @@ inline uint32_t pgm_read(const uint32_t* p) {
 #else
 
 #  ifndef ARDUINOJSON_DEFINE_PROGMEM_ARRAY
-#    define ARDUINOJSON_DEFINE_PROGMEM_ARRAY(type, name, value) \
-      static type const name[] = value;
+#    define ARDUINOJSON_DEFINE_PROGMEM_ARRAY(type, name, ...) \
+      static type const name[] = __VA_ARGS__;
 #  endif
 
 template <typename T>
diff --git a/src/ArduinoJson/Polyfills/preprocessor.hpp b/src/ArduinoJson/Polyfills/preprocessor.hpp
index cd1a13fb..b91baf74 100644
--- a/src/ArduinoJson/Polyfills/preprocessor.hpp
+++ b/src/ArduinoJson/Polyfills/preprocessor.hpp
@@ -4,12 +4,6 @@
 
 #pragma once
 
-#define ARDUINOJSON_EXPAND6(a, b, c, d, e, f) a, b, c, d, e, f
-#define ARDUINOJSON_EXPAND9(a, b, c, d, e, f, g, h, i) a, b, c, d, e, f, g, h, i
-#define ARDUINOJSON_EXPAND18(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, \
-                             q, r)                                           \
-  a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r
-
 #define ARDUINOJSON_CONCAT_(A, B) A##B
 #define ARDUINOJSON_CONCAT2(A, B) ARDUINOJSON_CONCAT_(A, B)
 #define ARDUINOJSON_CONCAT3(A, B, C) \