diff --git a/locale.c b/locale.c
index 1c94217d1b7f..ec3411351ace 100644
--- a/locale.c
+++ b/locale.c
@@ -500,20 +500,16 @@ S_wsetlocale(const int category, const wchar_t * wlocale)
 #endif  /* WIN32_USE_FAKE_OLD_MINGW_LOCALES */
 
 /* 'for' loop headers to hide the necessary casts */
-#define for_all_individual_category_indexes(i)                              \
-    for (locale_category_index i = (locale_category_index) 0;               \
-         i < LC_ALL_INDEX_;                                                 \
+#define for_category_indexes_between(i, m, n)                               \
+    for (locale_category_index i = (locale_category_index) (m);             \
+         i <= (locale_category_index) (n);                                  \
          i = (locale_category_index) ((int) i + 1))
-
+#define for_all_individual_category_indexes(i)                              \
+        for_category_indexes_between(i, 0, LC_ALL_INDEX_ - 1)
 #define for_all_but_0th_individual_category_indexes(i)                      \
-    for (locale_category_index i = (locale_category_index) 1;               \
-         i < LC_ALL_INDEX_;                                                 \
-         i = (locale_category_index) ((int) i + 1))
-
+        for_category_indexes_between(i, 1, LC_ALL_INDEX_ - 1)
 #define for_all_category_indexes(i)                                         \
-    for (locale_category_index i = (locale_category_index) 0;               \
-         i <= LC_ALL_INDEX_;                                                \
-         i = (locale_category_index) ((int) i + 1))
+        for_category_indexes_between(i, 0, LC_ALL_INDEX_)
 
 #ifdef USE_LOCALE
 #  if defined(USE_FAKE_LC_ALL_POSITIONAL_NOTATION) && defined(LC_ALL)
@@ -3226,9 +3222,9 @@ S_find_locale_from_environment(pTHX_ const locale_category_index index)
     /* For each desired category, use any corresponding environment variable;
      * or the default if none such exists. */
     bool is_disparate = false;  /* Assume is uniform until proven otherwise */
-    for (unsigned i = lower; i <= upper; i++) {
+    for_category_indexes_between(i, lower, upper) {
         const char * const env_override = PerlEnv_getenv(category_names[i]);
-        unsigned int j = i - offset;
+        locale_category_index j = (locale_category_index) (i - offset);
 
         if (env_override && strNE(env_override, "")) {
             locale_names[j] = env_override;