diff --git a/m-array.h b/m-array.h
index 6b032397..d5d96283 100644
--- a/m-array.h
+++ b/m-array.h
@@ -629,7 +629,7 @@
   M_C(name, _get_str)(string_t str, array_t array,			\
 		      bool append)					\
   {                                                                     \
-    STRING_CONTRACT(str);                                               \
+    STRINGI_CONTRACT(str);                                              \
     ARRAYI_CONTRACT(array);                                             \
     (append ? string_cat_str : string_set_str) (str, "[");              \
     array_it_t it;                                                      \
@@ -642,7 +642,7 @@
         string_push_back (str, M_GET_SEPARATOR oplist);                 \
     }                                                                   \
     string_push_back (str, ']');                                        \
-    STRING_CONTRACT(str);                                               \
+    STRINGI_CONTRACT(str);                                              \
   }                                                                     \
   , /* no GET_STR */ )                                                  \
 			      						\
diff --git a/m-deque.h b/m-deque.h
index 76910f91..392aa1cf 100644
--- a/m-deque.h
+++ b/m-deque.h
@@ -645,7 +645,7 @@
   static inline void                                                    \
   M_C(name, _get_str)(string_t str, deque_t deque, bool append)         \
   {                                                                     \
-    STRING_CONTRACT(str);                                               \
+    STRINGI_CONTRACT(str);                                              \
     DEQUEI_CONTRACT(deque);                                             \
     (append ? string_cat_str : string_set_str) (str, "[");              \
     it_t it;                                                            \
@@ -658,7 +658,7 @@
         string_push_back (str, M_GET_SEPARATOR oplist);                 \
     }                                                                   \
     string_push_back (str, ']');                                        \
-    STRING_CONTRACT(str);                                               \
+    STRINGI_CONTRACT(str);                                              \
   }                                                                     \
   , /* no GET_STR */ )                                                  \
 			      						\
diff --git a/m-dict.h b/m-dict.h
index fa4c6761..2f3f8f62 100644
--- a/m-dict.h
+++ b/m-dict.h
@@ -469,14 +469,14 @@
   static inline void                                                    \
   M_C(name, _get_str)(string_t str, dict_t dict, const bool append)	\
   {                                                                     \
-    STRING_CONTRACT (str);                                              \
+    STRINGI_CONTRACT (str);                                             \
     DICTI_CONTRACT(name, dict);                                         \
     (append ? string_cat_str : string_set_str) (str, "{");              \
     dict_it_t it;                                                       \
     for (M_C(name, _it)(it, dict) ;					\
          !M_C(name, _end_p)(it);					\
          M_C(name, _next)(it)){						\
-      const struct M_C(name, _pair_s) *item =					\
+      const struct M_C(name, _pair_s) *item =                           \
         M_C(name, _cref)(it);						\
       M_GET_GET_STR key_oplist (str, item->key, true);                  \
       string_push_back (str, ':');                                      \
@@ -485,7 +485,7 @@
         string_push_back (str, ',');                                    \
     }                                                                   \
     string_push_back (str, '}');                                        \
-    STRING_CONTRACT(str);                                               \
+    STRINGI_CONTRACT(str);                                              \
   }                                                                     \
   , /* no GET_STR */ )							\
                                                                         \