diff --git a/m-array.h b/m-array.h
index 82cd0322..94018d5c 100644
--- a/m-array.h
+++ b/m-array.h
@@ -76,7 +76,7 @@
 #define M_ARRA4_OPLIST_P3(name, oplist)                                       \
   (INIT(M_C(name, _init))                                                     \
    ,M_IF_METHOD2(INIT_SET,SET, oplist)(INIT_SET(M_C(name, _init_set)),)       \
-   ,M_IF_METHOD(INIT_SET, oplist)(INIT_WITH(API_1(M_INIT_VAI)),)              \
+   ,M_IF_METHOD(INIT_SET, oplist)(INIT_WITH(API_1(M_INIT_WITH_VAI)),)         \
    ,M_IF_METHOD2(INIT_SET,SET, oplist)(SET(M_C(name, _set)), )                \
    ,CLEAR(M_C(name, _clear))                                                  \
    ,INIT_MOVE(M_C(name, _init_move))                                          \
diff --git a/m-core.h b/m-core.h
index ca39f497..9a68b891 100644
--- a/m-core.h
+++ b/m-core.h
@@ -1684,7 +1684,7 @@ M_BEGIN_PROTECTED_CODE
 
 /* Remove the parenthesis if needed
    (internal macro) */
-#define M_REMOVE_PARENTHESIS(...)                                            \
+#define M_REMOVE_PARENTHESIS(...)                                             \
   M_IF(M_PARENTHESIS_P(__VA_ARGS__))(M_REMOVE_PARENTHESIS_2, M_REMOVE_PARENTHESIS_3)(__VA_ARGS__)
 #define M_REMOVE_PARENTHESIS_2(...) M_OPFLAT __VA_ARGS__
 #define M_REMOVE_PARENTHESIS_3(...) __VA_ARGS__
diff --git a/m-deque.h b/m-deque.h
index 493e2633..33a65748 100644
--- a/m-deque.h
+++ b/m-deque.h
@@ -264,6 +264,13 @@
     return ret;                                                               \
   }                                                                           \
                                                                               \
+  /* Internal, for INIT_WITH */                                               \
+  static inline type *                                                        \
+  M_C(name, _push_raw)(deque_t d)                                             \
+  {                                                                           \
+    return M_C(name, _push_back_raw)(d);                                      \
+  }                                                                           \
+                                                                              \
   static inline void                                                          \
   M_C(name, _push_back)(deque_t d, type const x)                              \
   {                                                                           \
@@ -982,7 +989,7 @@
 #define M_D3QU3_OPLIST_P3(name, oplist)                                       \
   (INIT(M_C(name, _init))                                                     \
    ,INIT_SET(M_C(name, _init_set))                                            \
-   ,INIT_WITH(API_1(M_INIT_VAI))                                              \
+   ,INIT_WITH(API_1(M_INIT_WITH_VAI))                                         \
    ,SET(M_C(name, _set))                                                      \
    ,CLEAR(M_C(name, _clear))                                                  \
    ,INIT_MOVE(M_C(name, _init_move))                                          \
diff --git a/m-list.h b/m-list.h
index ffb6fba6..838e939c 100644
--- a/m-list.h
+++ b/m-list.h
@@ -87,7 +87,7 @@
 #define M_L1ST_OPLIST_P3(name, oplist)                                        \
   (INIT(M_C(name, _init)),                                                    \
    INIT_SET(M_C(name, _init_set)),                                            \
-   INIT_WITH(API_1(M_INIT_VAI)),                                              \
+   INIT_WITH(API_1(M_INIT_WITH_VAI)),                                         \
    SET(M_C(name, _set)),                                                      \
    CLEAR(M_C(name, _clear)),                                                  \
    MOVE(M_C(name, _move)),                                                    \
@@ -990,6 +990,13 @@
     return ret;                                                               \
   }                                                                           \
                                                                               \
+  /* Internal, for INIT_WITH */                                               \
+  static inline type *                                                        \
+  M_C(name, _push_raw)(list_t d)                                              \
+  {                                                                           \
+    return M_C(name, _push_back_raw)(d);                                      \
+  }                                                                           \
+                                                                              \
   static inline void                                                          \
   M_C(name, _push_back)(list_t v, type const x)                               \
   {                                                                           \