#define sv_2io Perl_sv_2io
#ifdef PERL_IN_SV_C
#ifdef PERL_CORE
-#define glob_2inpuv S_glob_2inpuv
+#define glob_2number S_glob_2number
+#define glob_2pv S_glob_2pv
#endif
#endif
#define sv_2iv_flags Perl_sv_2iv_flags
#ifdef PERL_CORE
#define parse_body S_parse_body
#define run_body S_run_body
-#define call_body S_call_body
-#define call_list_body S_call_list_body
#define incpush_if_exists S_incpush_if_exists
#endif
#endif
#define sv_2io(a) Perl_sv_2io(aTHX_ a)
#ifdef PERL_IN_SV_C
#ifdef PERL_CORE
-#define glob_2inpuv(a,b,c) S_glob_2inpuv(aTHX_ a,b,c)
+#define glob_2number(a) S_glob_2number(aTHX_ a)
+#define glob_2pv(a,b) S_glob_2pv(aTHX_ a,b)
#endif
#endif
#define sv_2iv_flags(a,b) Perl_sv_2iv_flags(aTHX_ a,b)
#ifdef PERL_CORE
#define parse_body(a,b) S_parse_body(aTHX_ a,b)
#define run_body(a) S_run_body(aTHX_ a)
-#define call_body(a,b) S_call_body(aTHX_ a,b)
-#define call_list_body(a) S_call_list_body(aTHX_ a)
#define incpush_if_exists(a) S_incpush_if_exists(aTHX_ a)
#endif
#endif
#define dopoptowhen(a) S_dopoptowhen(aTHX_ a)
#define save_lines(a,b) S_save_lines(aTHX_ a,b)
#define doeval(a,b,c,d) S_doeval(aTHX_ a,b,c,d)
-#define check_type_and_open(a,b) S_check_type_and_open(aTHX_ a,b)
+#define check_type_and_open S_check_type_and_open
#define doopen_pm(a,b) S_doopen_pm(aTHX_ a,b)
#define path_is_absolute S_path_is_absolute
#define run_user_filter(a,b,c) S_run_user_filter(aTHX_ a,b,c)
#define expect_number(a) S_expect_number(aTHX_ a)
#endif
#ifdef PERL_CORE
-#define sv_pos_u2b_forwards(a,b,c) S_sv_pos_u2b_forwards(aTHX_ a,b,c)
-#define sv_pos_u2b_midway(a,b,c,d) S_sv_pos_u2b_midway(aTHX_ a,b,c,d)
+#define sv_pos_u2b_forwards S_sv_pos_u2b_forwards
+#define sv_pos_u2b_midway S_sv_pos_u2b_midway
#define sv_pos_u2b_cached(a,b,c,d,e,f,g) S_sv_pos_u2b_cached(aTHX_ a,b,c,d,e,f,g)
#define utf8_mg_pos_cache_update(a,b,c,d,e) S_utf8_mg_pos_cache_update(aTHX_ a,b,c,d,e)
#define sv_pos_b2u_forwards(a,b) S_sv_pos_b2u_forwards(aTHX_ a,b)