diff --git a/regen/scope_types.pl b/regen/scope_types.pl
index a3f406951793..bc09bd84e21e 100644
--- a/regen/scope_types.pl
+++ b/regen/scope_types.pl
@@ -72,12 +72,13 @@ BEGIN
 
 $c_code .= <<EOF_C;
 
+#ifdef WANT_LEAVE_SCOPE_ARG_COUNTS
 static const U8 leave_scope_arg_counts[] = {
 EOF_C
 
 foreach my $tuple (@arg_num) {
     my ($nargs, $type)= @$tuple;
-    $c_code .= sprintf "    %d%s /* %*s */\n",
+    $c_code .= sprintf "  %d%s /* %*s */\n",
         $nargs, $tuple == $arg_num[-1] ? " " : ",",
         -$tlen, $type;
 }
@@ -85,6 +86,7 @@ BEGIN
 
 $c_code .= <<EOF_C;
 };
+#endif
 
 #define MAX_SAVEt $max_savet
 EOF_C
diff --git a/scope.c b/scope.c
index b8063c27760b..629f24039d6b 100644
--- a/scope.c
+++ b/scope.c
@@ -24,6 +24,7 @@
 
 #include "EXTERN.h"
 #define PERL_IN_SCOPE_C
+#define WANT_LEAVE_SCOPE_ARG_COUNTS
 #include "perl.h"
 #include "feature.h"
 
diff --git a/scope_types.h b/scope_types.h
index 934303ae7bbd..77cc5a6445b3 100644
--- a/scope_types.h
+++ b/scope_types.h
@@ -84,67 +84,69 @@
 #define SAVEt_DELETE              57
 #define SAVEt_HINTS_HH            58
 
+#ifdef WANT_LEAVE_SCOPE_ARG_COUNTS
 static const U8 leave_scope_arg_counts[] = {
-    0, /* SAVEt_ALLOC               */
-    0, /* SAVEt_CLEARPADRANGE       */
-    0, /* SAVEt_CLEARSV             */
-    0, /* SAVEt_REGCONTEXT          */
-    1, /* SAVEt_TMPSFLOOR           */
-    1, /* SAVEt_BOOL                */
-    1, /* SAVEt_COMPILE_WARNINGS    */
-    1, /* SAVEt_CURCOP_WARNINGS     */
-    1, /* SAVEt_COMPPAD             */
-    1, /* SAVEt_FREECOPHH           */
-    1, /* SAVEt_FREEOP              */
-    1, /* SAVEt_FREEPV              */
-    1, /* SAVEt_FREESV              */
-    1, /* SAVEt_I16                 */
-    1, /* SAVEt_I32_SMALL           */
-    1, /* SAVEt_I8                  */
-    1, /* SAVEt_INT_SMALL           */
-    1, /* SAVEt_MORTALIZESV         */
-    1, /* SAVEt_NSTAB               */
-    1, /* SAVEt_OP                  */
-    1, /* SAVEt_PARSER              */
-    1, /* SAVEt_STACK_POS           */
-    1, /* SAVEt_READONLY_OFF        */
-    1, /* SAVEt_FREEPADNAME         */
-    1, /* SAVEt_STRLEN_SMALL        */
-    1, /* SAVEt_FREERCPV            */
-    1, /* SAVEt_FREE_REXC_STATE     */
-    2, /* SAVEt_AV                  */
-    2, /* SAVEt_DESTRUCTOR          */
-    2, /* SAVEt_DESTRUCTOR_X        */
-    2, /* SAVEt_GENERIC_PVREF       */
-    2, /* SAVEt_GENERIC_SVREF       */
-    2, /* SAVEt_GP                  */
-    2, /* SAVEt_GVSV                */
-    2, /* SAVEt_HINTS               */
-    2, /* SAVEt_HPTR                */
-    2, /* SAVEt_HV                  */
-    2, /* SAVEt_I32                 */
-    2, /* SAVEt_INT                 */
-    2, /* SAVEt_ITEM                */
-    2, /* SAVEt_IV                  */
-    2, /* SAVEt_PPTR                */
-    2, /* SAVEt_SAVESWITCHSTACK     */
-    2, /* SAVEt_SHARED_PVREF        */
-    2, /* SAVEt_SPTR                */
-    2, /* SAVEt_STRLEN              */
-    2, /* SAVEt_SV                  */
-    2, /* SAVEt_SVREF               */
-    2, /* SAVEt_VPTR                */
-    2, /* SAVEt_ADELETE             */
-    2, /* SAVEt_APTR                */
-    2, /* SAVEt_RCPV                */
-    3, /* SAVEt_HELEM               */
-    3, /* SAVEt_PADSV_AND_MORTALIZE */
-    3, /* SAVEt_SET_SVFLAGS         */
-    3, /* SAVEt_GVSLOT              */
-    3, /* SAVEt_AELEM               */
-    3, /* SAVEt_DELETE              */
-    3  /* SAVEt_HINTS_HH            */
+  0, /* SAVEt_ALLOC               */
+  0, /* SAVEt_CLEARPADRANGE       */
+  0, /* SAVEt_CLEARSV             */
+  0, /* SAVEt_REGCONTEXT          */
+  1, /* SAVEt_TMPSFLOOR           */
+  1, /* SAVEt_BOOL                */
+  1, /* SAVEt_COMPILE_WARNINGS    */
+  1, /* SAVEt_CURCOP_WARNINGS     */
+  1, /* SAVEt_COMPPAD             */
+  1, /* SAVEt_FREECOPHH           */
+  1, /* SAVEt_FREEOP              */
+  1, /* SAVEt_FREEPV              */
+  1, /* SAVEt_FREESV              */
+  1, /* SAVEt_I16                 */
+  1, /* SAVEt_I32_SMALL           */
+  1, /* SAVEt_I8                  */
+  1, /* SAVEt_INT_SMALL           */
+  1, /* SAVEt_MORTALIZESV         */
+  1, /* SAVEt_NSTAB               */
+  1, /* SAVEt_OP                  */
+  1, /* SAVEt_PARSER              */
+  1, /* SAVEt_STACK_POS           */
+  1, /* SAVEt_READONLY_OFF        */
+  1, /* SAVEt_FREEPADNAME         */
+  1, /* SAVEt_STRLEN_SMALL        */
+  1, /* SAVEt_FREERCPV            */
+  1, /* SAVEt_FREE_REXC_STATE     */
+  2, /* SAVEt_AV                  */
+  2, /* SAVEt_DESTRUCTOR          */
+  2, /* SAVEt_DESTRUCTOR_X        */
+  2, /* SAVEt_GENERIC_PVREF       */
+  2, /* SAVEt_GENERIC_SVREF       */
+  2, /* SAVEt_GP                  */
+  2, /* SAVEt_GVSV                */
+  2, /* SAVEt_HINTS               */
+  2, /* SAVEt_HPTR                */
+  2, /* SAVEt_HV                  */
+  2, /* SAVEt_I32                 */
+  2, /* SAVEt_INT                 */
+  2, /* SAVEt_ITEM                */
+  2, /* SAVEt_IV                  */
+  2, /* SAVEt_PPTR                */
+  2, /* SAVEt_SAVESWITCHSTACK     */
+  2, /* SAVEt_SHARED_PVREF        */
+  2, /* SAVEt_SPTR                */
+  2, /* SAVEt_STRLEN              */
+  2, /* SAVEt_SV                  */
+  2, /* SAVEt_SVREF               */
+  2, /* SAVEt_VPTR                */
+  2, /* SAVEt_ADELETE             */
+  2, /* SAVEt_APTR                */
+  2, /* SAVEt_RCPV                */
+  3, /* SAVEt_HELEM               */
+  3, /* SAVEt_PADSV_AND_MORTALIZE */
+  3, /* SAVEt_SET_SVFLAGS         */
+  3, /* SAVEt_GVSLOT              */
+  3, /* SAVEt_AELEM               */
+  3, /* SAVEt_DELETE              */
+  3  /* SAVEt_HINTS_HH            */
 };
+#endif
 
 #define MAX_SAVEt 58