From: Nicholas Clark <nick@ccl4.org>
Date: Tue, 12 Feb 2008 12:16:23 +0000 (+0000)
Subject: Correct (some) variable names in embed.fnc where they differ from the
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=4048f0105b8266fd1f895ab7bfaade86c079bdf5;p=p5sagit%2Fp5-mst-13.2.git

Correct (some) variable names in embed.fnc where they differ from the
actual function declaration.

p4raw-id: //depot/perl@33289
---

diff --git a/embed.fnc b/embed.fnc
index e47ecc1..371a455 100644
--- a/embed.fnc
+++ b/embed.fnc
@@ -45,25 +45,29 @@ START_EXTERN_C
 
 #if defined(PERL_IMPLICIT_SYS)
 Ano	|PerlInterpreter*|perl_alloc_using \
-				|NN struct IPerlMem* m|NN struct IPerlMem* ms \
-				|NN struct IPerlMem* mp|NN struct IPerlEnv* e \
-				|NN struct IPerlStdIO* io|NN struct IPerlLIO* lio \
-				|NN struct IPerlDir* d|NN struct IPerlSock* s \
-				|NN struct IPerlProc* p
+				|NN struct IPerlMem *ipM \
+				|NN struct IPerlMem *ipMS \
+				|NN struct IPerlMem *ipMP \
+				|NN struct IPerlEnv *ipE \
+				|NN struct IPerlStdIO *ipStd \
+				|NN struct IPerlLIO *ipLio \
+				|NN struct IPerlDir *ipD \
+				|NN struct IPerlSock *ipS \
+				|NN struct IPerlProc *ipP
 #endif
 Anod	|PerlInterpreter*	|perl_alloc
-Anod	|void	|perl_construct	|NN PerlInterpreter* interp
-Anod	|int	|perl_destruct	|NN PerlInterpreter* interp
-Anod	|void	|perl_free	|NN PerlInterpreter* interp
-Anod	|int	|perl_run	|NN PerlInterpreter* interp
-Anod	|int	|perl_parse	|NN PerlInterpreter* interp|XSINIT_t xsinit \
+Anod	|void	|perl_construct	|NN PerlInterpreter *my_perl
+Anod	|int	|perl_destruct	|NN PerlInterpreter *my_perl
+Anod	|void	|perl_free	|NN PerlInterpreter *my_perl
+Anod	|int	|perl_run	|NN PerlInterpreter *my_perl
+Anod	|int	|perl_parse	|NN PerlInterpreter *my_perl|XSINIT_t xsinit \
 				|int argc|NULLOK char** argv|NULLOK char** env
 AnpR	|bool	|doing_taint	|int argc|NULLOK char** argv|NULLOK char** env
 #if defined(USE_ITHREADS)
-Anod	|PerlInterpreter*|perl_clone|NN PerlInterpreter* interp|UV flags
+Anod	|PerlInterpreter*|perl_clone|NN PerlInterpreter *proto_perl|UV flags
 #  if defined(PERL_IMPLICIT_SYS)
 Ano	|PerlInterpreter*|perl_clone_using \
-				|NN PerlInterpreter *interp|UV flags \
+				|NN PerlInterpreter *proto_perl|UV flags \
 				|NN struct IPerlMem* m|NN struct IPerlMem* ms \
 				|NN struct IPerlMem* mp|NN struct IPerlEnv* e \
 				|NN struct IPerlStdIO* io|NN struct IPerlLIO* lio \
@@ -95,36 +99,36 @@ p	|OP*	|append_elem	|I32 optype|NULLOK OP* first|NULLOK OP* last
 p	|OP*	|append_list	|I32 optype|NULLOK LISTOP* first|NULLOK LISTOP* last
 p	|I32	|apply		|I32 type|NN SV** mark|NN SV** sp
 ApM	|void	|apply_attrs_string|NN const char *stashpv|NN CV *cv|NN const char *attrstr|STRLEN len
-Apd	|void	|av_clear	|NN AV* ar
-Apd	|SV*	|av_delete	|NN AV* ar|I32 key|I32 flags
-ApdR	|bool	|av_exists	|NN AV* ar|I32 key
-Apd	|void	|av_extend	|NN AV* ar|I32 key
-pR	|AV*	|av_fake	|I32 size|NN SV** svp
-ApdR	|SV**	|av_fetch	|NN AV* ar|I32 key|I32 lval
-Apd	|void	|av_fill	|NN AV* ar|I32 fill
-ApdR	|I32	|av_len		|NN const AV* ar
-ApdR	|AV*	|av_make	|I32 size|NN SV** svp
-Apd	|SV*	|av_pop		|NN AV* ar
+Apd	|void	|av_clear	|NN AV *av
+Apd	|SV*	|av_delete	|NN AV *av|I32 key|I32 flags
+ApdR	|bool	|av_exists	|NN AV *av|I32 key
+Apd	|void	|av_extend	|NN AV *av|I32 key
+pR	|AV*	|av_fake	|I32 size|NN SV **strp
+ApdR	|SV**	|av_fetch	|NN AV *av|I32 key|I32 lval
+Apd	|void	|av_fill	|NN AV *av|I32 fill
+ApdR	|I32	|av_len		|NN const AV *av
+ApdR	|AV*	|av_make	|I32 size|NN SV **strp
+Apd	|SV*	|av_pop		|NN AV *av
 ApdoxM	|void	|av_create_and_push|NN AV **const avp|NN SV *const val
-Apd	|void	|av_push	|NN AV* ar|NN SV* val
-EXp	|void	|av_reify	|NN AV* ar
-ApdR	|SV*	|av_shift	|NN AV* ar
-Apd	|SV**	|av_store	|NN AV* ar|I32 key|NULLOK SV* val
-Apd	|void	|av_undef	|NN AV* ar
+Apd	|void	|av_push	|NN AV *av|NN SV *val
+EXp	|void	|av_reify	|NN AV *av
+ApdR	|SV*	|av_shift	|NN AV *av
+Apd	|SV**	|av_store	|NN AV *av|I32 key|NULLOK SV *val
+Apd	|void	|av_undef	|NN AV *av
 ApdoxM	|SV**	|av_create_and_unshift_one|NN AV **const avp|NN SV *const val
-Apd	|void	|av_unshift	|NN AV* ar|I32 num
-Apo	|SV**	|av_arylen_p	|NN AV* av
-Apo	|IV*	|av_iter_p	|NN AV* av
+Apd	|void	|av_unshift	|NN AV *av|I32 num
+Apo	|SV**	|av_arylen_p	|NN AV *av
+Apo	|IV*	|av_iter_p	|NN AV *av
 #if defined(PERL_IN_AV_C) || defined(PERL_DECL_PROT)
 s	|MAGIC*	|get_aux_mg	|NN AV *av
 #endif
-pR	|OP*	|bind_match	|I32 type|NN OP* left|NN OP* pat
+pR	|OP*	|bind_match	|I32 type|NN OP *left|NN OP *right
 pR	|OP*	|block_end	|I32 floor|NULLOK OP* seq
 ApR	|I32	|block_gimme
 pR	|int	|block_start	|int full
 p	|void	|boot_core_UNIVERSAL
 p	|void	|boot_core_PerlIO
-Ap	|void	|call_list	|I32 oldscope|NN AV* av_list
+Ap	|void	|call_list	|I32 oldscope|NN AV *paramList
 pR	|bool	|cando		|Mode_t mode|bool effective|NN const Stat_t* statbufp
 ApR	|U32	|cast_ulong	|NV f
 ApR	|I32	|cast_i32	|NV f
@@ -152,8 +156,8 @@ Afnp	|void	|sv_catpvf_nocontext|NN SV* sv|NN const char* pat|...
 Afnp	|void	|sv_setpvf_nocontext|NN SV* sv|NN const char* pat|...
 Afnp	|void	|sv_catpvf_mg_nocontext|NN SV* sv|NN const char* pat|...
 Afnp	|void	|sv_setpvf_mg_nocontext|NN SV* sv|NN const char* pat|...
-Afnp	|int	|fprintf_nocontext|NN PerlIO* stream|NN const char* fmt|...
-Afnp	|int	|printf_nocontext|NN const char* fmt|...
+Afnp	|int	|fprintf_nocontext|NN PerlIO *stream|NN const char *format|...
+Afnp	|int	|printf_nocontext|NN const char *format|...
 #endif
 bp	|void	|cv_ckproto	|NN const CV* cv|NULLOK const GV* gv\
 				|NULLOK const char* p
@@ -167,7 +171,7 @@ Apd	|void	|cv_undef	|NN CV* cv
 Ap	|void	|cx_dump	|NN PERL_CONTEXT* cx
 Ap	|SV*	|filter_add	|NULLOK filter_t funcp|NULLOK SV* datasv
 Ap	|void	|filter_del	|NN filter_t funcp
-ApR	|I32	|filter_read	|int idx|NN SV* buffer|int maxlen
+ApR	|I32	|filter_read	|int idx|NN SV *buf_sv|int maxlen
 ApPR	|char**	|get_op_descs
 ApPR	|char**	|get_op_names
 pPR	|const char*	|get_no_modify
@@ -192,7 +196,7 @@ Ap	|void	|dounwind	|I32 cxix
 pmb	|bool	|do_aexec	|NULLOK SV* really|NN SV** mark|NN SV** sp
 p	|bool	|do_aexec5	|NULLOK SV* really|NN SV** mark|NN SV** sp|int fd|int do_report
 Ap	|int	|do_binmode	|NN PerlIO *fp|int iotype|int mode
-p	|void	|do_chop	|NN SV* asv|NN SV* sv
+p	|void	|do_chop	|NN SV *astr|NN SV *sv
 Ap	|bool	|do_close	|NULLOK GV* gv|bool not_implicit
 p	|bool	|do_eof		|NN GV* gv
 
@@ -208,7 +212,7 @@ Ap	|int	|do_spawn	|NN char* cmd
 Ap	|int	|do_spawn_nowait|NN char* cmd
 #endif
 #if !defined(WIN32)
-p	|bool	|do_exec3	|NN const char* cmd|int fd|int do_report
+p	|bool	|do_exec3	|NN const char *incmd|int fd|int do_report
 #endif
 p	|void	|do_execfree
 #ifdef PERL_IN_DOIO_C
@@ -222,16 +226,17 @@ p	|I32	|do_msgsnd	|NN SV** mark|NN SV** sp
 p	|I32	|do_semop	|NN SV** mark|NN SV** sp
 p	|I32	|do_shmio	|I32 optype|NN SV** mark|NN SV** sp
 #endif
-Ap	|void	|do_join	|NN SV* sv|NN SV* del|NN SV** mark|NN SV** sp
+Ap	|void	|do_join	|NN SV *sv|NN SV *delim|NN SV **mark|NN SV **sp
 p	|OP*	|do_kv
 Apmb	|bool	|do_open	|NN GV* gv|NN const char* name|I32 len|int as_raw \
 				|int rawmode|int rawperm|NULLOK PerlIO* supplied_fp
 Ap	|bool	|do_open9	|NN GV *gv|NN const char *name|I32 len|int as_raw \
 				|int rawmode|int rawperm|NULLOK PerlIO *supplied_fp \
 				|NN SV *svs|I32 num
-Ap	|bool	|do_openn	|NN GV *gv|NN const char *name|I32 len|int as_raw \
-				|int rawmode|int rawperm|NULLOK PerlIO *supplied_fp \
-				|NULLOK SV **svp|I32 num
+Ap	|bool	|do_openn	|NN GV *gv|NN const char *oname|I32 len \
+				|int as_raw|int rawmode|int rawperm \
+				|NULLOK PerlIO *supplied_fp|NULLOK SV **svp \
+				|I32 num
 p	|bool	|do_print	|NULLOK SV* sv|NN PerlIO* fp
 pR	|OP*	|do_readline
 p	|I32	|do_chomp	|NN SV* sv
@@ -252,7 +257,7 @@ Ap	|void	|dump_fds	|NN char* s
 #endif
 Ap	|void	|dump_form	|NN const GV* gv
 Ap	|void	|gv_dump	|NN GV* gv
-Ap	|void	|op_dump	|NN const OP* arg
+Ap	|void	|op_dump	|NN const OP *o
 Ap	|void	|pmop_dump	|NULLOK PMOP* pm
 Ap	|void	|dump_packsubs	|NN const HV* stash
 Ap	|void	|dump_sub	|NN const GV* gv
@@ -262,7 +267,7 @@ ApdR	|char*	|fbm_instr	|NN unsigned char* big|NN unsigned char* bigend \
 p	|char*	|find_script	|NN const char *scriptname|bool dosearch \
 				|NULLOK const char *const *const search_ext|I32 flags
 p	|OP*	|force_list	|NULLOK OP* arg
-p	|OP*	|fold_constants	|NN OP* arg
+p	|OP*	|fold_constants	|NN OP *o
 Afpd	|char*	|form		|NN const char* pat|...
 Ap	|char*	|vform		|NN const char* pat|NULLOK va_list* args
 Ap	|void	|free_tmps
@@ -288,7 +293,7 @@ Apd	|GV*	|gv_fetchmeth	|NULLOK HV* stash|NN const char* name|STRLEN len|I32 leve
 Apd	|GV*	|gv_fetchmeth_autoload	|NULLOK HV* stash|NN const char* name|STRLEN len|I32 level
 Apdmb	|GV*	|gv_fetchmethod	|NULLOK HV* stash|NN const char* name
 Apd	|GV*	|gv_fetchmethod_autoload|NULLOK HV* stash|NN const char* name|I32 autoload
-Ap	|GV*	|gv_fetchpv	|NN const char* name|I32 add|I32 sv_type
+Ap	|GV*	|gv_fetchpv	|NN const char *nambeg|I32 add|I32 sv_type
 Ap	|void	|gv_fullname	|NN SV* sv|NN const GV* gv
 Apmb	|void	|gv_fullname3	|NN SV* sv|NN const GV* gv|NULLOK const char* prefix
 Ap	|void	|gv_fullname4	|NN SV* sv|NN const GV* gv|NULLOK const char* prefix|bool keepmain
@@ -298,33 +303,33 @@ Ap	|void	|gv_name_set	|NN GV* gv|NN const char *name|U32 len|U32 flags
 Apd	|HV*	|gv_stashpv	|NN const char* name|I32 flags
 Apd	|HV*	|gv_stashpvn	|NN const char* name|U32 namelen|I32 flags
 Apd	|HV*	|gv_stashsv	|NN SV* sv|I32 flags
-Apd	|void	|hv_clear	|NULLOK HV* tb
+Apd	|void	|hv_clear	|NULLOK HV *hv
 poM	|HV *	|hv_copy_hints_hv|NULLOK HV *const ohv
-Ap	|void	|hv_delayfree_ent|NN HV* hv|NULLOK HE* entry
-Abmd	|SV*	|hv_delete	|NULLOK HV* tb|NN const char* key|I32 klen \
+Ap	|void	|hv_delayfree_ent|NN HV *hv|NULLOK HE *entry
+Abmd	|SV*	|hv_delete	|NULLOK HV *hv|NN const char *key|I32 klen \
 				|I32 flags
-Abmd	|SV*	|hv_delete_ent	|NULLOK HV* tb|NN SV* key|I32 flags|U32 hash
-AbmdR	|bool	|hv_exists	|NULLOK HV* tb|NN const char* key|I32 klen
-AbmdR	|bool	|hv_exists_ent	|NULLOK HV* tb|NN SV* key|U32 hash
-Abmd	|SV**	|hv_fetch	|NULLOK HV* tb|NN const char* key|I32 klen \
+Abmd	|SV*	|hv_delete_ent	|NULLOK HV *hv|NN SV *keysv|I32 flags|U32 hash
+AbmdR	|bool	|hv_exists	|NULLOK HV *hv|NN const char *key|I32 klen
+AbmdR	|bool	|hv_exists_ent	|NULLOK HV *hv|NN SV *keysv|U32 hash
+Abmd	|SV**	|hv_fetch	|NULLOK HV *hv|NN const char *key|I32 klen \
 				|I32 lval
-Abmd	|HE*	|hv_fetch_ent	|NULLOK HV* tb|NN SV* key|I32 lval|U32 hash
-Ap	|void*	|hv_common	|NULLOK HV* tb|NULLOK SV* keysv \
+Abmd	|HE*	|hv_fetch_ent	|NULLOK HV *hv|NN SV *keysv|I32 lval|U32 hash
+Ap	|void*	|hv_common	|NULLOK HV *hv|NULLOK SV *keysv \
 				|NULLOK const char* key|STRLEN klen|int flags \
-				|int action|NULLOK SV* val|U32 hash
+				|int action|NULLOK SV *val|U32 hash
 Ap	|void*	|hv_common_key_len|NULLOK HV *hv|NN const char *key \
 				|I32 klen_i32|const int action|NULLOK SV *val \
 				|const U32 hash
-Ap	|void	|hv_free_ent	|NN HV* hv|NULLOK HE* entryK
-Apd	|I32	|hv_iterinit	|NN HV* tb
+Ap	|void	|hv_free_ent	|NN HV *hv|NULLOK HE *entryK
+Apd	|I32	|hv_iterinit	|NN HV *hv
 ApdR	|char*	|hv_iterkey	|NN HE* entry|NN I32* retlen
 ApdR	|SV*	|hv_iterkeysv	|NN HE* entry
-ApdRbm	|HE*	|hv_iternext	|NN HV* tb
-ApdR	|SV*	|hv_iternextsv	|NN HV* hv|NN char** key|NN I32* retlen
-ApMdR	|HE*	|hv_iternext_flags|NN HV* tb|I32 flags
-ApdR	|SV*	|hv_iterval	|NN HV* tb|NN HE* entry
-Ap	|void	|hv_ksplit	|NN HV* hv|IV newmax
-Apdbm	|void	|hv_magic	|NN HV* hv|NULLOK GV* gv|int how
+ApdRbm	|HE*	|hv_iternext	|NN HV *hv
+ApdR	|SV*	|hv_iternextsv	|NN HV *hv|NN char **key|NN I32 *retlen
+ApMdR	|HE*	|hv_iternext_flags|NN HV *hv|I32 flags
+ApdR	|SV*	|hv_iterval	|NN HV *hv|NN HE *entry
+Ap	|void	|hv_ksplit	|NN HV *hv|IV newmax
+Apdbm	|void	|hv_magic	|NN HV *hv|NULLOK GV *gv|int how
 XEdpoM	|HV *	|refcounted_he_chain_2hv|NULLOK const struct refcounted_he *c
 XEpoM	|SV *	|refcounted_he_fetch|NULLOK const struct refcounted_he *chain \
 				|NULLOK SV *keysv|NULLOK const char *key \
@@ -333,16 +338,18 @@ dpoM	|void	|refcounted_he_free|NULLOK struct refcounted_he *he
 XEdpoM	|struct refcounted_he *|refcounted_he_new \
 				|NULLOK struct refcounted_he *const parent \
 				|NULLOK SV *const key|NULLOK SV *const value
-Abmd	|SV**	|hv_store	|NULLOK HV* tb|NULLOK const char* key \
-				|I32 klen|NULLOK SV* val|U32 hash
-Abmd	|HE*	|hv_store_ent	|NULLOK HV* tb|NULLOK SV* key|NULLOK SV* val|U32 hash
-AbmdM	|SV**	|hv_store_flags	|NULLOK HV* tb|NULLOK const char* key \
-				|I32 klen|NULLOK SV* val|U32 hash|int flags
-Apd	|void	|hv_undef	|NULLOK HV* tb
+Abmd	|SV**	|hv_store	|NULLOK HV *hv|NULLOK const char *key \
+				|I32 klen|NULLOK SV *val|U32 hash
+Abmd	|HE*	|hv_store_ent	|NULLOK HV *hv|NULLOK SV *key|NULLOK SV *val\
+				|U32 hash
+AbmdM	|SV**	|hv_store_flags	|NULLOK HV *hv|NULLOK const char *key \
+				|I32 klen|NULLOK SV *val|U32 hash|int flags
+Apd	|void	|hv_undef	|NULLOK HV *hv
 ApP	|I32	|ibcmp		|NN const char* a|NN const char* b|I32 len
 ApP	|I32	|ibcmp_locale	|NN const char* a|NN const char* b|I32 len
-Apd	|I32	|ibcmp_utf8	|NN const char* a|NULLOK char **pe1|UV l1|bool u1 \
-				|NN const char* b|NULLOK char **pe2|UV l2|bool u2
+Apd	|I32	|ibcmp_utf8	|NN const char *s1|NULLOK char **pe1|UV l1 \
+				|bool u1|NN const char *s2|NULLOK char **pe2 \
+				|UV l2|bool u2
 pR	|bool	|ingroup	|Gid_t testgid|bool effective
 p	|void	|init_argv_symbols|int argc|NN char **argv
 p	|void	|init_debugger
@@ -389,7 +396,7 @@ ApPR	|bool	|is_uni_lower_lc|UV c
 ApPR	|bool	|is_uni_print_lc|UV c
 ApPR	|bool	|is_uni_punct_lc|UV c
 ApPR	|bool	|is_uni_xdigit_lc|UV c
-Apd	|STRLEN	|is_utf8_char	|NN const U8 *p
+Apd	|STRLEN	|is_utf8_char	|NN const U8 *s
 Apd	|bool	|is_utf8_string	|NN const U8 *s|STRLEN len
 Apdmb	|bool	|is_utf8_string_loc|NN const U8 *s|STRLEN len|NULLOK const U8 **p
 Apd	|bool	|is_utf8_string_loclen|NN const U8 *s|STRLEN len|NULLOK const U8 **ep|NULLOK STRLEN *el
@@ -409,8 +416,8 @@ ApR	|bool	|is_utf8_print	|NN const U8 *p
 ApR	|bool	|is_utf8_punct	|NN const U8 *p
 ApR	|bool	|is_utf8_xdigit	|NN const U8 *p
 ApR	|bool	|is_utf8_mark	|NN const U8 *p
-p	|OP*	|jmaybe		|NN OP* arg
-pP	|I32	|keyword	|NN const char* d|I32 len|bool all_keywords
+p	|OP*	|jmaybe		|NN OP *o
+pP	|I32	|keyword	|NN const char *name|I32 len|bool all_keywords
 Ap	|void	|leave_scope	|I32 base
 EXp	|void	|lex_end
 p	|void	|lex_start	|NULLOK SV* line|NULLOK PerlIO *rsfp|bool new_filter
@@ -423,7 +430,7 @@ p	|OP*	|list		|NULLOK OP* o
 p	|OP*	|listkids	|NULLOK OP* o
 Apd	|void	|load_module|U32 flags|NN SV* name|NULLOK SV* ver|...
 Ap	|void	|vload_module|U32 flags|NN SV* name|NULLOK SV* ver|NULLOK va_list* args
-p	|OP*	|localize	|NN OP* arg|I32 lexical
+p	|OP*	|localize	|NN OP *o|I32 lex
 ApdR	|I32	|looks_like_number|NN SV *const sv
 Apd	|UV	|grok_bin	|NN const char* start|NN STRLEN* len_p|NN I32* flags|NULLOK NV *result
 Apd	|UV	|grok_hex	|NN const char* start|NN STRLEN* len_p|NN I32* flags|NULLOK NV *result
@@ -450,7 +457,7 @@ p	|int	|magic_gettaint	|NN SV* sv|NN MAGIC* mg
 p	|int	|magic_getuvar	|NN SV* sv|NN MAGIC* mg
 p	|int	|magic_getvec	|NN SV* sv|NN MAGIC* mg
 p	|U32	|magic_len	|NN SV* sv|NN MAGIC* mg
-p	|int	|magic_nextpack	|NN SV* sv|NN MAGIC* mg|NN SV* key
+p	|int	|magic_nextpack	|NN SV *sv|NN MAGIC *mg|NN SV *key
 p	|U32	|magic_regdata_cnt|NN SV* sv|NN MAGIC* mg
 p	|int	|magic_regdatum_get|NN SV* sv|NN MAGIC* mg
 pr	|int	|magic_regdatum_set|NN SV* sv|NN MAGIC* mg
@@ -489,7 +496,8 @@ EXp	|void	|qerror		|NN SV* err
 Apd	|void	|sortsv		|NULLOK SV** array|size_t num_elts|NN SVCOMPARE_t cmp
 Apd	|void	|sortsv_flags	|NULLOK SV** array|size_t num_elts|NN SVCOMPARE_t cmp|U32 flags
 Apd	|int	|mg_clear	|NN SV* sv
-Apd	|int	|mg_copy	|NN SV* sv|NN SV* nsv|NULLOK const char* key|I32 klen
+Apd	|int	|mg_copy	|NN SV *sv|NN SV *nsv|NULLOK const char *key \
+				|I32 klen
 pd	|void	|mg_localize	|NN SV* sv|NN SV* nsv
 ApdR	|MAGIC*	|mg_find	|NULLOK const SV* sv|int type
 Apd	|int	|mg_free	|NN SV* sv
@@ -549,7 +557,7 @@ Ap	|void	|newFORM	|I32 floor|NULLOK OP* o|NULLOK OP* block
 Apa	|OP*	|newFOROP	|I32 flags|NULLOK char* label|line_t forline \
 				|NULLOK OP* sv|NN OP* expr|NULLOK OP* block|NULLOK OP* cont
 Apa	|OP*	|newGIVENOP	|NN OP* cond|NN OP* block|PADOFFSET defsv_off
-Apa	|OP*	|newLOGOP	|I32 optype|I32 flags|NN OP* left|NN OP* right
+Apa	|OP*	|newLOGOP	|I32 optype|I32 flags|NN OP *first|NN OP *other
 Apa	|OP*	|newLOOPEX	|I32 type|NN OP* label
 Apa	|OP*	|newLOOPOP	|I32 flags|I32 debuggable|NULLOK OP* expr|NULLOK OP* block
 Apa	|OP*	|newNULLLIST
@@ -562,7 +570,8 @@ Ap	|CV*	|newSUB		|I32 floor|NULLOK OP* o|NULLOK OP* proto|NULLOK OP* block
 ApM	|CV *	|newXS_flags	|NULLOK const char *name|NN XSUBADDR_t subaddr\
 				|NN const char *const filename \
 				|NULLOK const char *const proto|U32 flags
-Apd	|CV*	|newXS		|NULLOK const char* name|NN XSUBADDR_t f|NN const char* filename
+Apd	|CV*	|newXS		|NULLOK const char *name|NN XSUBADDR_t subaddr\
+				|NN const char *filename
 AmdbR	|AV*	|newAV
 Apa	|OP*	|newAVREF	|NN OP* o
 Apa	|OP*	|newBINOP	|I32 type|I32 flags|NULLOK OP* first|NULLOK OP* last
@@ -572,7 +581,7 @@ Apa	|GV*	|newGVgen	|NN const char* pack
 Apa	|OP*	|newGVREF	|I32 type|NULLOK OP* o
 ApaR	|OP*	|newHVREF	|NN OP* o
 AmdbR	|HV*	|newHV
-ApaR	|HV*	|newHVhv	|NULLOK HV* hv
+ApaR	|HV*	|newHVhv	|NULLOK HV *hv
 Apa	|IO*	|newIO
 Apa	|OP*	|newLISTOP	|I32 type|I32 flags|NULLOK OP* first|NULLOK OP* last
 #ifdef USE_ITHREADS
@@ -604,7 +613,8 @@ Apa	|OP*	|newWHILEOP	|I32 flags|I32 debuggable|NULLOK LOOP* loop \
 				|I32 whileline|NULLOK OP* expr|NULLOK OP* block|NULLOK OP* cont \
 				|I32 has_my
 Apa	|PERL_SI*|new_stackinfo|I32 stitems|I32 cxitems
-Ap	|char*	|scan_vstring	|NN const char *vstr|NN const char *const end|NN SV *sv
+Ap	|char*	|scan_vstring	|NN const char *s|NN const char *const e \
+				|NN SV *sv
 Apd	|const char*	|scan_version	|NN const char *s|NN SV *rv|bool qv
 Apd	|SV*	|new_version	|NN SV *ver
 Apd	|SV*	|upg_version	|NN SV *ver|bool qv
@@ -635,12 +645,12 @@ pd	|void	|pad_free	|PADOFFSET po
 pd	|void	|pad_reset
 pd	|void	|pad_swipe	|PADOFFSET po|bool refadjust
 p	|void	|peep		|NULLOK OP* o
-dopM	|PerlIO*|start_glob	|NN SV* pattern|NN IO *io
+dopM	|PerlIO*|start_glob	|NN SV *tmpglob|NN IO *io
 #if defined(USE_REENTRANT_API)
 Ap	|void	|reentrant_size
 Ap	|void	|reentrant_init
 Ap	|void	|reentrant_free
-Anp	|void*	|reentrant_retry|NN const char*|...
+Anp	|void*	|reentrant_retry|NN const char *f|...
 #endif
 Ap	|void	|call_atexit	|ATEXIT_t fn|NULLOK void *ptr
 Apd	|I32	|call_argv	|NN const char* sub_name|I32 flags|NN char** argv
@@ -672,7 +682,7 @@ Apd	|void	|packlist 	|NN SV *cat|NN const char *pat|NN const char *patend|NN SV
 p	|void	|pidgone	|Pid_t pid|int status
 #endif
 Ap	|void	|pmflag		|NN U32* pmfl|int ch
-p	|OP*	|pmruntime	|NN OP* pm|NN OP* expr|bool isreg
+p	|OP*	|pmruntime	|NN OP *o|NN OP *expr|bool isreg
 p	|OP*	|pmtrans	|NN OP* o|NN OP* expr|NN OP* repl
 Ap	|void	|pop_scope
 p	|OP*	|prepend_elem	|I32 optype|NULLOK OP* head|NULLOK OP* tail
@@ -681,14 +691,16 @@ Amb	|OP*	|ref		|NULLOK OP* o|I32 type
 p	|OP*	|refkids	|NULLOK OP* o|I32 type
 Ap	|void	|regdump	|NN const regexp* r
 Ap	|void	|regdump	|NN const regexp* r
-Ap	|SV*	|regclass_swash	|NULLOK const regexp *prog|NN const struct regnode *n|bool doinit|NULLOK SV **listsvp|NULLOK SV **altsvp
+Ap	|SV*	|regclass_swash	|NULLOK const regexp *prog \
+				|NN const struct regnode *node|bool doinit \
+				|NULLOK SV **listsvp|NULLOK SV **altsvp
 Ap	|I32	|pregexec	|NN REGEXP * const prog|NN char* stringarg \
 				|NN char* strend|NN char* strbeg|I32 minend \
 				|NN SV* screamer|U32 nosave
 Ap	|void	|pregfree	|NULLOK REGEXP* r
-Ap	|void	|pregfree2	|NN REGEXP* prog
+Ap	|void	|pregfree2	|NN REGEXP *rx
 EXp	|REGEXP*|reg_temp_copy	|NN REGEXP* r
-Ap	|void	|regfree_internal|NN REGEXP * const rx
+Ap	|void	|regfree_internal|NN REGEXP *const rx
 #if defined(USE_ITHREADS)
 Ap	|void*	|regdupe_internal|NN REGEXP * const r|NN CLONE_PARAMS* param
 #endif
@@ -697,10 +709,10 @@ Ap	|REGEXP*|re_compile	|NN const SV * const pattern|U32 flags
 Ap	|char*	|re_intuit_start|NN REGEXP * const rx|NULLOK SV* sv|NN char* strpos \
 				|NN char* strend|const U32 flags \
 				|NULLOK re_scream_pos_data *data
-Ap	|SV*	|re_intuit_string|NN REGEXP * const rx
-Ap	|I32	|regexec_flags	|NN REGEXP * const rx|NN char* stringarg \
-				|NN char* strend|NN char* strbeg|I32 minend \
-				|NN SV* screamer|NULLOK void* data|U32 flags
+Ap	|SV*	|re_intuit_string|NN REGEXP  *const r
+Ap	|I32	|regexec_flags	|NN REGEXP *const rx|NN char *stringarg \
+				|NN char *strend|NN char *strbeg|I32 minend \
+				|NN SV *sv|NULLOK void *data|U32 flags
 ApR	|regnode*|regnext	|NULLOK regnode* p
 
 EXp |SV*|reg_named_buff          |NN REGEXP * const rx|NULLOK SV * const key \
@@ -729,8 +741,8 @@ p	|int	|rsignal_restore|int i|NULLOK Sigsave_t* t
 p	|int	|rsignal_save	|int i|Sighandler_t t1|NN Sigsave_t* save
 Ap	|Sighandler_t|rsignal_state|int i
 p	|void	|rxres_free	|NN void** rsp
-p	|void	|rxres_restore	|NN void** rsp|NN REGEXP* prx
-p	|void	|rxres_save	|NN void** rsp|NN REGEXP* prx
+p	|void	|rxres_restore	|NN void **rsp|NN REGEXP *rx
+p	|void	|rxres_save	|NN void **rsp|NN REGEXP *rx
 #if !defined(HAS_RENAME)
 p	|I32	|same_dirent	|NN const char* a|NN const char* b
 #endif
@@ -747,7 +759,7 @@ Ap	|void	|save_aptr	|NN AV** aptr
 Ap	|AV*	|save_ary	|NN GV* gv
 Ap	|void	|save_bool	|NN bool* boolp
 Ap	|void	|save_clearsv	|NN SV** svp
-Ap	|void	|save_delete	|NN HV* hv|NN char* key|I32 klen
+Ap	|void	|save_delete	|NN HV *hv|NN char *key|I32 klen
 Ap	|void	|save_destructor|DESTRUCTORFUNC_NOCONTEXT_t f|NN void* p
 Ap	|void	|save_destructor_x|DESTRUCTORFUNC_t f|NULLOK void* p
 Ap	|void	|save_freesv	|NULLOK SV* sv
@@ -758,14 +770,14 @@ Ap	|void	|save_generic_pvref|NN char** str
 Ap	|void	|save_shared_pvref|NN char** str
 Ap	|void	|save_gp	|NN GV* gv|I32 empty
 Ap	|HV*	|save_hash	|NN GV* gv
-Ap	|void	|save_helem	|NN HV* hv|NN SV *key|NN SV **sptr
+Ap	|void	|save_helem	|NN HV *hv|NN SV *key|NN SV **sptr
 Ap	|void	|save_hptr	|NN HV** hptr
 Ap	|void	|save_I16	|NN I16* intp
 Ap	|void	|save_I32	|NN I32* intp
 Ap	|void	|save_I8	|NN I8* bytep
 Ap	|void	|save_int	|NN int* intp
 Ap	|void	|save_item	|NN SV* item
-Ap	|void	|save_iv	|NN IV* iv
+Ap	|void	|save_iv	|NN IV *ivp
 Ap	|void	|save_list	|NN SV** sarg|I32 maxsarg
 Ap	|void	|save_long	|NN long* longp
 Ap	|void	|save_mortalizesv|NN SV* sv
@@ -773,7 +785,7 @@ Ap	|void	|save_nogv	|NN GV* gv
 p	|void	|save_op
 Ap	|SV*	|save_scalar	|NN GV* gv
 Ap	|void	|save_pptr	|NN char** pptr
-Ap	|void	|save_vptr	|NN void* pptr
+Ap	|void	|save_vptr	|NN void *ptr
 Ap	|void	|save_re_context
 Ap	|void	|save_padsv_and_mortalize|PADOFFSET off
 Ap	|void	|save_sptr	|NN SV** sptr
@@ -827,9 +839,9 @@ Apd	|UV	|sv_2uv_flags	|NULLOK SV *const sv|const I32 flags
 Apd	|IV	|sv_iv		|NN SV* sv
 Apd	|UV	|sv_uv		|NN SV* sv
 Apd	|NV	|sv_nv		|NN SV* sv
-Apd	|char*	|sv_pvn		|NN SV *sv|NN STRLEN *len
-Apd	|char*	|sv_pvutf8n	|NN SV *sv|NN STRLEN *len
-Apd	|char*	|sv_pvbyten	|NN SV *sv|NN STRLEN *len
+Apd	|char*	|sv_pvn		|NN SV *sv|NN STRLEN *lp
+Apd	|char*	|sv_pvutf8n	|NN SV *sv|NN STRLEN *lp
+Apd	|char*	|sv_pvbyten	|NN SV *sv|NN STRLEN *lp
 Apd	|I32	|sv_true	|NULLOK SV *sv
 pd	|void	|sv_add_arena	|NN char *const ptr|const U32 size|const U32 flags
 Apd	|int	|sv_backoff	|NN SV *const sv
@@ -837,8 +849,8 @@ Apd	|SV*	|sv_bless	|NN SV* sv|NN HV* stash
 Afpd	|void	|sv_catpvf	|NN SV* sv|NN const char* pat|...
 Apd	|void	|sv_vcatpvf	|NN SV* sv|NN const char* pat|NULLOK va_list* args
 Apd	|void	|sv_catpv	|NN SV* sv|NULLOK const char* ptr
-Amdb	|void	|sv_catpvn	|NN SV* sv|NN const char* ptr|STRLEN len
-Amdb	|void	|sv_catsv	|NN SV* dsv|NULLOK SV* ssv
+Amdb	|void	|sv_catpvn	|NN SV *dsv|NN const char *sstr|STRLEN len
+Amdb	|void	|sv_catsv	|NN SV *dstr|NULLOK SV *sstr
 Apd	|void	|sv_chop	|NN SV* sv|NULLOK const char* ptr
 pd	|I32	|sv_clean_all
 pd	|void	|sv_clean_objs
@@ -848,7 +860,8 @@ Apd	|I32	|sv_cmp_locale	|NULLOK SV* sv1|NULLOK SV* sv2
 #if defined(USE_LOCALE_COLLATE)
 Apd	|char*	|sv_collxfrm	|NN SV* sv|NN STRLEN* nxp
 #endif
-Ap	|OP*	|sv_compile_2op	|NN SV* sv|NN OP** startp|NN const char* code|NN PAD** padp
+Ap	|OP*	|sv_compile_2op	|NN SV *sv|NN OP **startop \
+				|NN const char *code|NN PAD **padp
 Apd	|int	|getcwd_sv	|NN SV* sv
 Apd	|void	|sv_dec		|NULLOK SV* sv
 Ap	|void	|sv_dump	|NN SV* sv
@@ -861,8 +874,8 @@ pd	|void	|sv_free_arenas
 Apd	|char*	|sv_gets	|NN SV* sv|NN PerlIO* fp|I32 append
 Apd	|char*	|sv_grow	|NN SV *const sv|STRLEN newlen
 Apd	|void	|sv_inc		|NULLOK SV* sv
-Apd	|void	|sv_insert	|NN SV* bigsv|STRLEN offset|STRLEN len \
-				|NN const char* little|STRLEN littlelen
+Apd	|void	|sv_insert	|NN SV *bigstr|STRLEN offset|STRLEN len \
+				|NN const char *little|STRLEN littlelen
 Apd	|int	|sv_isa		|NULLOK SV* sv|NN const char* name
 Apd	|int	|sv_isobject	|NULLOK SV* sv
 Apd	|STRLEN	|sv_len		|NULLOK SV* sv
@@ -900,12 +913,12 @@ Apd	|SV*	|sv_setref_pv	|NN SV* rv|NULLOK const char* classname|NULLOK void* pv
 Apd	|SV*	|sv_setref_pvn	|NN SV* rv|NULLOK const char* classname|NN const char* pv|STRLEN n
 Apd	|void	|sv_setpv	|NN SV* sv|NULLOK const char* ptr
 Apd	|void	|sv_setpvn	|NN SV* sv|NULLOK const char* ptr|STRLEN len
-Amdb	|void	|sv_setsv	|NN SV* dsv|NULLOK SV* ssv
+Amdb	|void	|sv_setsv	|NN SV *dstr|NULLOK SV *sstr
 Amdb	|void	|sv_taint	|NN SV* sv
 ApdR	|bool	|sv_tainted	|NN SV* sv
 Apd	|int	|sv_unmagic	|NN SV* sv|int type
 Apdmb	|void	|sv_unref	|NN SV* sv
-Apd	|void	|sv_unref_flags	|NN SV* sv|U32 flags
+Apd	|void	|sv_unref_flags	|NN SV *ref|U32 flags
 Apd	|void	|sv_untaint	|NN SV* sv
 Apd	|void	|sv_upgrade	|NN SV *const sv|svtype new_type
 Apdmb	|void	|sv_usepvn	|NN SV* sv|NULLOK char* ptr|STRLEN len
@@ -1013,7 +1026,7 @@ Afpd	|void	|sv_catpvf_mg	|NN SV *sv|NN const char* pat|...
 Apd	|void	|sv_vcatpvf_mg	|NN SV* sv|NN const char* pat|NULLOK va_list* args
 Apd	|void	|sv_catpv_mg	|NN SV *sv|NULLOK const char *ptr
 Apdbm	|void	|sv_catpvn_mg	|NN SV *sv|NN const char *ptr|STRLEN len
-Apdbm	|void	|sv_catsv_mg	|NN SV *dstr|NULLOK SV *sstr
+Apdbm	|void	|sv_catsv_mg	|NN SV *dsv|NULLOK SV *ssv
 Afpd	|void	|sv_setpvf_mg	|NN SV *sv|NN const char* pat|...
 Apd	|void	|sv_vsetpvf_mg	|NN SV* sv|NN const char* pat|NULLOK va_list* args
 Apd	|void	|sv_setiv_mg	|NN SV *const sv|const IV i
@@ -1111,8 +1124,8 @@ Ap	|void	|sys_intern_clear
 Ap	|void	|sys_intern_init
 #endif
 
-ApR	|const char *	|custom_op_name	|NN const OP* op
-ApR	|const char *	|custom_op_desc	|NN const OP* op
+ApR	|const char *	|custom_op_name	|NN const OP *o
+ApR	|const char *	|custom_op_desc	|NN const OP *o
 
 Adp	|void	|sv_nosharing	|NULLOK SV *sv
 Adpbm	|void	|sv_nolocking	|NULLOK SV *sv
@@ -1153,12 +1166,13 @@ sa	|HE*	|new_he
 sanR	|HEK*	|save_hek_flags	|NN const char *str|I32 len|U32 hash|int flags
 sn	|void	|hv_magic_check	|NN HV *hv|NN bool *needs_copy|NN bool *needs_store
 s	|void	|unshare_hek_or_pvn|NULLOK const HEK* hek|NULLOK const char* str|I32 len|U32 hash
-sR	|HEK*	|share_hek_flags|NN const char* sv|I32 len|U32 hash|int flags
+sR	|HEK*	|share_hek_flags|NN const char *str|I32 len|U32 hash|int flags
 rs	|void	|hv_notallowed	|int flags|NN const char *key|I32 klen|NN const char *msg
 sn	|struct xpvhv_aux*|hv_auxinit|NN HV *hv
-sM	|SV*	|hv_delete_common|NULLOK HV* tb|NULLOK SV* keysv|NULLOK const char* key \
-		|STRLEN klen|int k_flags|I32 d_flags|U32 hash
-sM	|void	|clear_placeholders	|NN HV* hb|U32 items
+sM	|SV*	|hv_delete_common|NULLOK HV *hv|NULLOK SV *keysv \
+		|NULLOK const char *key|STRLEN klen|int k_flags|I32 d_flags \
+		|U32 hash
+sM	|void	|clear_placeholders	|NN HV *hv|U32 items
 sM	|SV *	|refcounted_he_value	|NN const struct refcounted_he *he
 #endif
 
@@ -1319,8 +1333,9 @@ s	|I32	|measure_struct	|NN struct tempsym* symptr
 s	|bool	|next_symbol	|NN struct tempsym* symptr
 sR	|SV*	|is_an_int	|NN const char *s|STRLEN l
 s	|int	|div128		|NN SV *pnum|NN bool *done
-s	|const char *|group_end	|NN const char *pat|NN const char *patend|char ender
-sR	|const char *|get_num	|NN const char *ppat|NN I32 *lenptr
+s	|const char *|group_end	|NN const char *patptr|NN const char *patend \
+				|char ender
+sR	|const char *|get_num	|NN const char *patptr|NN I32 *lenptr
 ns	|bool	|need_utf8	|NN const char *pat|NN const char *patend
 ns	|char	|first_symbol	|NN const char *pat|NN const char *patend
 sR	|char *	|sv_exp_grow	|NN SV *sv|STRLEN needed
@@ -1362,8 +1377,8 @@ s	|I32	|sv_ncmp	|NN SV *a|NN SV *b
 s	|I32	|sv_i_ncmp	|NN SV *a|NN SV *b
 s	|I32	|amagic_ncmp	|NN SV *a|NN SV *b
 s	|I32	|amagic_i_ncmp	|NN SV *a|NN SV *b
-s	|I32	|amagic_cmp	|NN SV *a|NN SV *b
-s	|I32	|amagic_cmp_locale|NN SV *a|NN SV *b
+s	|I32	|amagic_cmp	|NN SV *str1|NN SV *str2
+s	|I32	|amagic_cmp_locale|NN SV *str1|NN SV *str2
 s	|I32	|sortcv		|NN SV *a|NN SV *b
 s	|I32	|sortcv_xsub	|NN SV *a|NN SV *b
 s	|I32	|sortcv_stacked	|NN SV *a|NN SV *b
@@ -1379,48 +1394,70 @@ s	|SV *	|space_join_names_mortal|NN char *const *array
 #endif
 
 #if defined(PERL_IN_REGCOMP_C) || defined(PERL_DECL_PROT)
-Es	|regnode*|reg		|NN struct RExC_state_t *state|I32 paren|NN I32 *flagp|U32 depth
-Es	|regnode*|reganode	|NN struct RExC_state_t *state|U8 op|U32 arg
-Es	|regnode*|regatom	|NN struct RExC_state_t *state|NN I32 *flagp|U32 depth
-Es	|regnode*|regbranch	|NN struct RExC_state_t *state|NN I32 *flagp|I32 first|U32 depth
-Es	|STRLEN	|reguni		|NN const struct RExC_state_t *state|UV uv|NN char *s
-Es	|regnode*|regclass	|NN struct RExC_state_t *state|U32 depth
+Es	|regnode*|reg		|NN struct RExC_state_t *pRExC_state \
+				|I32 paren|NN I32 *flagp|U32 depth
+Es	|regnode*|reganode	|NN struct RExC_state_t *pRExC_state|U8 op \
+				|U32 arg
+Es	|regnode*|regatom	|NN struct RExC_state_t *pRExC_state \
+				|NN I32 *flagp|U32 depth
+Es	|regnode*|regbranch	|NN struct RExC_state_t *pRExC_state \
+				|NN I32 *flagp|I32 first|U32 depth
+Es	|STRLEN	|reguni		|NN const struct RExC_state_t *pRExC_state \
+				|UV uv|NN char *s
+Es	|regnode*|regclass	|NN struct RExC_state_t *pRExC_state|U32 depth
 ERsn	|I32	|regcurly	|NN const char *s
-Es	|regnode*|reg_node	|NN struct RExC_state_t *state|U8 op
+Es	|regnode*|reg_node	|NN struct RExC_state_t *pRExC_state|U8 op
 Es	|UV	|reg_recode	|const char value|NN SV **encp
-Es	|regnode*|regpiece	|NN struct RExC_state_t *state|NN I32 *flagp|U32 depth
-Es	|regnode*|reg_namedseq	|NN struct RExC_state_t *state|NULLOK UV *valuep
-Es	|void	|reginsert	|NN struct RExC_state_t *state|U8 op|NN regnode *opnd|U32 depth
-Es	|void	|regtail	|NN struct RExC_state_t *state|NN regnode *p|NN const regnode *val|U32 depth
-Es	|SV *	|reg_scan_name	|NN struct RExC_state_t *state|U32 flags
-Es	|U32	|join_exact	|NN struct RExC_state_t *state|NN regnode *scan|NN I32 *min|U32 flags|NULLOK regnode *val|U32 depth
-EsRn	|char *	|regwhite	|NN struct RExC_state_t *state|NN char *p
-Es	|char *	|nextchar	|NN struct RExC_state_t *state
-Es	|bool	|reg_skipcomment|NN struct RExC_state_t *state
-Es	|void	|scan_commit	|NN const struct RExC_state_t* state|NN struct scan_data_t *data|NN I32 *minlenp|int is_inf
-Esn	|void	|cl_anything	|NN const struct RExC_state_t* state|NN struct regnode_charclass_class *cl
+Es	|regnode*|regpiece	|NN struct RExC_state_t *pRExC_state \
+				|NN I32 *flagp|U32 depth
+Es	|regnode*|reg_namedseq	|NN struct RExC_state_t *pRExC_state \
+				|NULLOK UV *valuep
+Es	|void	|reginsert	|NN struct RExC_state_t *pRExC_state \
+				|U8 op|NN regnode *opnd|U32 depth
+Es	|void	|regtail	|NN struct RExC_state_t *pRExC_state \
+				|NN regnode *p|NN const regnode *val|U32 depth
+Es	|SV *	|reg_scan_name	|NN struct RExC_state_t *pRExC_state \
+				|U32 flags
+Es	|U32	|join_exact	|NN struct RExC_state_t *pRExC_state \
+				|NN regnode *scan|NN I32 *min|U32 flags|NULLOK regnode *val|U32 depth
+EsRn	|char *	|regwhite	|NN struct RExC_state_t *pRExC_state \
+				|NN char *p
+Es	|char *	|nextchar	|NN struct RExC_state_t *pRExC_state
+Es	|bool	|reg_skipcomment|NN struct RExC_state_t *pRExC_state
+Es	|void	|scan_commit	|NN const struct RExC_state_t *pRExC_state \
+				|NN struct scan_data_t *data|NN I32 *minlenp \
+				|int is_inf
+Esn	|void	|cl_anything	|NN const struct RExC_state_t *pRExC_state \
+				|NN struct regnode_charclass_class *cl
 EsRn	|int	|cl_is_anything	|NN const struct regnode_charclass_class *cl
-Esn	|void	|cl_init	|NN const struct RExC_state_t* state|NN struct regnode_charclass_class *cl
-Esn	|void	|cl_init_zero	|NN const struct RExC_state_t* state|NN struct regnode_charclass_class *cl
+Esn	|void	|cl_init	|NN const struct RExC_state_t *pRExC_state \
+				|NN struct regnode_charclass_class *cl
+Esn	|void	|cl_init_zero	|NN const struct RExC_state_t *pRExC_state \
+				|NN struct regnode_charclass_class *cl
 Esn	|void	|cl_and		|NN struct regnode_charclass_class *cl \
 				|NN const struct regnode_charclass_class *and_with
-Esn	|void	|cl_or		|NN const struct RExC_state_t* state|NN struct regnode_charclass_class *cl \
+Esn	|void	|cl_or		|NN const struct RExC_state_t *pRExC_state \
+				|NN struct regnode_charclass_class *cl \
 				|NN const struct regnode_charclass_class *or_with
-Es	|I32	|study_chunk	|NN struct RExC_state_t* state|NN regnode **scanp \
-				|NN I32 *minlenp|NN I32 *deltap \
-				|NN regnode *last|NULLOK struct scan_data_t *data \
+Es	|I32	|study_chunk	|NN struct RExC_state_t *pRExC_state \
+				|NN regnode **scanp|NN I32 *minlenp \
+				|NN I32 *deltap|NN regnode *last \
+				|NULLOK struct scan_data_t *data \
 				|I32 stopparen|NULLOK U8* recursed \
 				|NULLOK struct regnode_charclass_class *and_withp \
 				|U32 flags|U32 depth
-EsRn	|U32	|add_data	|NN struct RExC_state_t* state|U32 n|NN const char *s
+EsRn	|U32	|add_data	|NN struct RExC_state_t *pRExC_state|U32 n \
+				|NN const char *s
 rs	|void	|re_croak2	|NN const char* pat1|NN const char* pat2|...
-Es	|I32	|regpposixcc	|NN struct RExC_state_t* state|I32 value
-Es	|void	|checkposixcc	|NN struct RExC_state_t* state
-Es	|I32	|make_trie	|NN struct RExC_state_t* state|NN regnode *startbranch \
-				|NN regnode *first|NN regnode *last|NN regnode *tail \
+Es	|I32	|regpposixcc	|NN struct RExC_state_t *pRExC_state|I32 value
+Es	|void	|checkposixcc	|NN struct RExC_state_t *pRExC_state
+Es	|I32	|make_trie	|NN struct RExC_state_t *pRExC_state \
+				|NN regnode *startbranch|NN regnode *first \
+				|NN regnode *last|NN regnode *tail \
 				|U32 word_count|U32 flags|U32 depth
-Es	|void	|make_trie_failtable	|NN struct RExC_state_t* state \
-                                |NN regnode *source|NN regnode *node|U32 depth
+Es	|void	|make_trie_failtable	|NN struct RExC_state_t *pRExC_state \
+                                |NN regnode *source|NN regnode *stclass \
+				|U32 depth
 #  ifdef DEBUGGING
 Es	|void	|regdump_extflags|NULLOK const char *lead| const U32 flags
 Es	|const regnode*|dumpuntil|NN const regexp *r|NN const regnode *start \
@@ -1438,7 +1475,8 @@ Es	|void	|dump_trie_interim_list|NN const struct _reg_trie_data *trie\
 Es	|void	|dump_trie_interim_table|NN const struct _reg_trie_data *trie\
 				|NULLOK HV* widecharmap|NN AV *revcharmap\
 				|U32 next_alloc|U32 depth
-Es	|U8	|regtail_study	|NN struct RExC_state_t *state|NN regnode *p|NN const regnode *val|U32 depth
+Es	|U8	|regtail_study	|NN struct RExC_state_t *pRExC_state \
+				|NN regnode *p|NN const regnode *val|U32 depth
 #  endif
 #endif
 
@@ -1450,16 +1488,18 @@ ERs	|bool	|reginclass	|NULLOK const regexp *prog|NN const regnode *n|NN const U8
 				|bool do_utf8sv_is_utf8
 Es	|CHECKPOINT|regcppush	|I32 parenfloor
 Es	|char*	|regcppop	|NN const regexp *rex
-ERsn	|U8*	|reghop3	|NN U8 *pos|I32 off|NN const U8 *lim
+ERsn	|U8*	|reghop3	|NN U8 *s|I32 off|NN const U8 *lim
 #ifdef XXX_dmq
-ERsn	|U8*	|reghop4	|NN U8 *pos|I32 off|NN const U8 *llim|NN const U8 *rlim
+ERsn	|U8*	|reghop4	|NN U8 *s|I32 off|NN const U8 *llim \
+				|NN const U8 *rlim
 #endif
-ERsn	|U8*	|reghopmaybe3	|NN U8 *pos|I32 off|NN const U8 *lim
+ERsn	|U8*	|reghopmaybe3	|NN U8 *s|I32 off|NN const U8 *lim
 ERs	|char*	|find_byclass	|NN regexp * prog|NN const regnode *c|NN char *s|NN const char *strend|NULLOK regmatch_info *reginfo
 Es	|void	|swap_match_buff|NN regexp * prog
 Es	|void	|to_utf8_substr	|NN regexp * prog
 Es	|void	|to_byte_substr	|NN regexp * prog
-ERs	|I32	|reg_check_named_buff_matched	|NN const regexp *rex|NN const regnode *prog
+ERs	|I32	|reg_check_named_buff_matched	|NN const regexp *rex \
+						|NN const regnode *scan
 #  ifdef DEBUGGING
 Es	|void	|dump_exec_pos	|NN const char *locinput|NN const regnode *scan|NN const char *loc_regeol\
 				|NN const char *loc_bostr|NN const char *loc_reg_starttry|const bool do_utf8
@@ -1495,7 +1535,7 @@ nsR	|char *	|uiv_2buf	|NN char *const buf|const IV iv|UV uv|const int is_uv|NN c
 s	|void	|sv_unglob	|NN SV* sv
 s	|void	|not_a_number	|NN SV *const sv
 s	|I32	|visit		|NN SVFUNC_t f|const U32 flags|const U32 mask
-s	|void	|sv_del_backref	|NN SV *target|NN SV *ref
+s	|void	|sv_del_backref	|NN SV *tsv|NN SV *sv
 sR	|SV *	|varname	|NULLOK GV *gv|const char gvtype|PADOFFSET targ \
 				|NULLOK SV *keyname|I32 aindex|int subscript_type
 #  ifdef DEBUGGING
@@ -1536,7 +1576,7 @@ sRn	|PTR_TBL_ENT_t *|ptr_table_find|NN PTR_TBL_t *tbl|NULLOK const void *sv
 #if defined(PERL_IN_TOKE_C) || defined(PERL_DECL_PROT)
 s	|void	|check_uni
 s	|void	|force_next	|I32 type
-s	|char*	|force_version	|NN char *start|int guessing
+s	|char*	|force_version	|NN char *s|int guessing
 s	|char*	|force_word	|NN char *start|int token|int check_keyword \
 				|int allow_pack|int allow_tick
 s	|SV*	|tokeq		|NN SV *sv
@@ -1620,8 +1660,9 @@ sR	|SV*	|swash_get	|NN SV* swash|UV start|UV span
 
 START_EXTERN_C
 
-Apd	|void	|sv_setsv_flags	|NN SV* dsv|NULLOK SV* ssv|I32 flags
-Apd	|void	|sv_catpvn_flags|NN SV* sv|NN const char* ptr|STRLEN len|I32 flags
+Apd	|void	|sv_setsv_flags	|NN SV *dstr|NULLOK SV *sstr|I32 flags
+Apd	|void	|sv_catpvn_flags|NN SV *dstr|NN const char *sstr|STRLEN len \
+				|I32 flags
 Apd	|void	|sv_catsv_flags	|NN SV* dsv|NULLOK SV* ssv|I32 flags
 Apd	|STRLEN	|sv_utf8_upgrade_flags|NN SV *sv|I32 flags
 Apd	|char*	|sv_pvn_force_flags|NN SV* sv|NULLOK STRLEN* lp|I32 flags
@@ -1647,9 +1688,12 @@ Ap	|void	|PerlIO_set_cnt		|NULLOK PerlIO *f|int cnt
 Ap	|void	|PerlIO_set_ptrcnt	|NULLOK PerlIO *f|NULLOK STDCHAR *ptr \
 					|int cnt
 Ap	|void	|PerlIO_setlinebuf	|NULLOK PerlIO *f
-Ap	|SSize_t|PerlIO_read		|NULLOK PerlIO *f|NN void *buf|Size_t count
-Ap	|SSize_t|PerlIO_write		|NULLOK PerlIO *f|NN const void *buf|Size_t count
-Ap	|SSize_t|PerlIO_unread		|NULLOK PerlIO *f|NN const void *buf|Size_t count
+Ap	|SSize_t|PerlIO_read		|NULLOK PerlIO *f|NN void *vbuf \
+					|Size_t count
+Ap	|SSize_t|PerlIO_write		|NULLOK PerlIO *f|NN const void *vbuf \
+					|Size_t count
+Ap	|SSize_t|PerlIO_unread		|NULLOK PerlIO *f|NN const void *vbuf \
+					|Size_t count
 Ap	|Off_t	|PerlIO_tell		|NULLOK PerlIO *f
 Ap	|int	|PerlIO_seek		|NULLOK PerlIO *f|Off_t offset|int whence
 
@@ -1699,25 +1743,25 @@ p	|void	|free_tied_hv_pool
 #if defined(DEBUGGING)
 pR	|int	|get_debug_opts	|NN const char **s|bool givehelp
 #endif
-Ap	|void	|save_set_svflags|NN SV* sv|U32 mask|U32 val
-Apod	|void	|hv_assert	|NN HV* tb
+Ap	|void	|save_set_svflags|NN SV *sv|U32 mask|U32 val
+Apod	|void	|hv_assert	|NN HV *hv
 
-ApdR	|SV*	|hv_scalar	|NN HV* hv
-ApoR	|I32*	|hv_riter_p	|NN HV* hv
-ApoR	|HE**	|hv_eiter_p	|NN HV* hv
-Apo	|void	|hv_riter_set	|NN HV* hv|I32 riter
-Apo	|void	|hv_eiter_set	|NN HV* hv|NULLOK HE* eiter
-Ap	|void	|hv_name_set	|NN HV* hv|NULLOK const char *name|U32 len|U32 flags
-poM	|AV**	|hv_backreferences_p	|NN HV* hv
+ApdR	|SV*	|hv_scalar	|NN HV *hv
+ApoR	|I32*	|hv_riter_p	|NN HV *hv
+ApoR	|HE**	|hv_eiter_p	|NN HV *hv
+Apo	|void	|hv_riter_set	|NN HV *hv|I32 riter
+Apo	|void	|hv_eiter_set	|NN HV *hv|NULLOK HE *eiter
+Ap	|void	|hv_name_set	|NN HV *hv|NULLOK const char *name|U32 len|U32 flags
+poM	|AV**	|hv_backreferences_p	|NN HV *hv
 #if defined(PERL_IN_DUMP_C) || defined(PERL_IN_HV_C) || defined(PERL_IN_SV_C) || defined(PERL_DECL_PROT)
-poM	|void	|hv_kill_backrefs	|NN HV* hv
+poM	|void	|hv_kill_backrefs	|NN HV *hv
 #endif
-Apd	|void	|hv_clear_placeholders	|NN HV* hb
-ApoR	|I32*	|hv_placeholders_p	|NN HV* hv
-ApoR	|I32	|hv_placeholders_get	|NN HV* hv
-Apo	|void	|hv_placeholders_set	|NN HV* hv|I32 ph
+Apd	|void	|hv_clear_placeholders	|NN HV *hv
+ApoR	|I32*	|hv_placeholders_p	|NN HV *hv
+ApoR	|I32	|hv_placeholders_get	|NN HV *hv
+Apo	|void	|hv_placeholders_set	|NN HV *hv|I32 ph
 
-p	|SV*	|magic_scalarpack|NN HV* hv|NN MAGIC* mg
+p	|SV*	|magic_scalarpack|NN HV *hv|NN MAGIC *mg
 
 #if defined(PERL_IN_SV_C) || defined(PERL_DECL_PROT)
 s	|SV *	|find_hash_subscript|NULLOK HV *hv|NN SV *val
@@ -1873,8 +1917,8 @@ Mp	|void	|op_xmldump	|NN const OP* arg
 
 Mp	|TOKEN*	|newTOKEN	|I32 optype|YYSTYPE lval \
 				|NULLOK MADPROP* madprop
-Mp	|void	|token_free	|NN TOKEN* arg
-Mp	|void	|token_getmad	|NN TOKEN* arg|NULLOK OP* o|char slot
+Mp	|void	|token_free	|NN TOKEN *tk
+Mp	|void	|token_getmad	|NN TOKEN *tk|NULLOK OP *o|char slot
 Mp	|void	|op_getmad_weak	|NULLOK OP* from|NULLOK OP* o|char slot
 Mp	|void	|op_getmad	|NULLOK OP* from|NULLOK OP* o|char slot
 Mp	|void	|prepend_madprops|NULLOK MADPROP* mp|NULLOK OP* o|char slot
diff --git a/pod/perlapi.pod b/pod/perlapi.pod
index 17bc41c..a7d1202 100644
--- a/pod/perlapi.pod
+++ b/pod/perlapi.pod
@@ -129,7 +129,7 @@ X<av_clear>
 Clears an array, making it empty.  Does not free the memory used by the
 array itself.
 
-	void	av_clear(AV* ar)
+	void	av_clear(AV *av)
 
 =for hackers
 Found in file av.c
@@ -170,7 +170,7 @@ Deletes the element indexed by C<key> from the array.  Returns the
 deleted element. If C<flags> equals C<G_DISCARD>, the element is freed
 and null is returned.
 
-	SV*	av_delete(AV* ar, I32 key, I32 flags)
+	SV*	av_delete(AV *av, I32 key, I32 flags)
 
 =for hackers
 Found in file av.c
@@ -183,7 +183,7 @@ Returns true if the element indexed by C<key> has been initialized.
 This relies on the fact that uninitialized array elements are set to
 C<&PL_sv_undef>.
 
-	bool	av_exists(AV* ar, I32 key)
+	bool	av_exists(AV *av, I32 key)
 
 =for hackers
 Found in file av.c
@@ -194,7 +194,7 @@ X<av_extend>
 Pre-extend an array.  The C<key> is the index to which the array should be
 extended.
 
-	void	av_extend(AV* ar, I32 key)
+	void	av_extend(AV *av, I32 key)
 
 =for hackers
 Found in file av.c
@@ -209,7 +209,7 @@ that the return value is non-null before dereferencing it to a C<SV*>.
 See L<perlguts/"Understanding the Magic of Tied Hashes and Arrays"> for
 more information on how to use this function on tied arrays. 
 
-	SV**	av_fetch(AV* ar, I32 key, I32 lval)
+	SV**	av_fetch(AV *av, I32 key, I32 lval)
 
 =for hackers
 Found in file av.c
@@ -226,7 +226,7 @@ additional elements appended are set to C<PL_sv_undef>.  If the array
 was longer, then the excess elements are freed.  C<av_fill(av, -1)> is
 the same as C<av_clear(av)>.
 
-	void	av_fill(AV* ar, I32 fill)
+	void	av_fill(AV *av, I32 fill)
 
 =for hackers
 Found in file av.c
@@ -237,7 +237,7 @@ X<av_len>
 Returns the highest index in the array.  The number of elements in the
 array is C<av_len(av) + 1>.  Returns -1 if the array is empty.
 
-	I32	av_len(const AV* ar)
+	I32	av_len(const AV *av)
 
 =for hackers
 Found in file av.c
@@ -249,7 +249,7 @@ Creates a new AV and populates it with a list of SVs.  The SVs are copied
 into the array, so they may be freed after the call to av_make.  The new AV
 will have a reference count of 1.
 
-	AV*	av_make(I32 size, SV** svp)
+	AV*	av_make(I32 size, SV **strp)
 
 =for hackers
 Found in file av.c
@@ -260,7 +260,7 @@ X<av_pop>
 Pops an SV off the end of the array.  Returns C<&PL_sv_undef> if the array
 is empty.
 
-	SV*	av_pop(AV* ar)
+	SV*	av_pop(AV *av)
 
 =for hackers
 Found in file av.c
@@ -271,7 +271,7 @@ X<av_push>
 Pushes an SV onto the end of the array.  The array will grow automatically
 to accommodate the addition.
 
-	void	av_push(AV* ar, SV* val)
+	void	av_push(AV *av, SV *val)
 
 =for hackers
 Found in file av.c
@@ -281,7 +281,7 @@ X<av_shift>
 
 Shifts an SV off the beginning of the array.
 
-	SV*	av_shift(AV* ar)
+	SV*	av_shift(AV *av)
 
 =for hackers
 Found in file av.c
@@ -300,7 +300,7 @@ returned NULL.
 See L<perlguts/"Understanding the Magic of Tied Hashes and Arrays"> for
 more information on how to use this function on tied arrays.
 
-	SV**	av_store(AV* ar, I32 key, SV* val)
+	SV**	av_store(AV *av, I32 key, SV *val)
 
 =for hackers
 Found in file av.c
@@ -310,7 +310,7 @@ X<av_undef>
 
 Undefines the array.  Frees the memory used by the array itself.
 
-	void	av_undef(AV* ar)
+	void	av_undef(AV *av)
 
 =for hackers
 Found in file av.c
@@ -322,7 +322,7 @@ Unshift the given number of C<undef> values onto the beginning of the
 array.  The array will grow automatically to accommodate the addition.  You
 must then use C<av_store> to assign values to these new elements.
 
-	void	av_unshift(AV* ar, I32 num)
+	void	av_unshift(AV *av, I32 num)
 
 =for hackers
 Found in file av.c
@@ -632,7 +632,7 @@ if you just want to do some stuff in a separate perl interpreter
 and then throw it away and return to the original one,
 you don't need to do anything.
 
-	PerlInterpreter*	perl_clone(PerlInterpreter* interp, UV flags)
+	PerlInterpreter*	perl_clone(PerlInterpreter *proto_perl, UV flags)
 
 =for hackers
 Found in file sv.c
@@ -745,7 +745,7 @@ X<perl_construct>
 
 Initializes a new Perl interpreter.  See L<perlembed>.
 
-	void	perl_construct(PerlInterpreter* interp)
+	void	perl_construct(PerlInterpreter *my_perl)
 
 =for hackers
 Found in file perl.c
@@ -755,7 +755,7 @@ X<perl_destruct>
 
 Shuts down a Perl interpreter.  See L<perlembed>.
 
-	int	perl_destruct(PerlInterpreter* interp)
+	int	perl_destruct(PerlInterpreter *my_perl)
 
 =for hackers
 Found in file perl.c
@@ -765,7 +765,7 @@ X<perl_free>
 
 Releases a Perl interpreter.  See L<perlembed>.
 
-	void	perl_free(PerlInterpreter* interp)
+	void	perl_free(PerlInterpreter *my_perl)
 
 =for hackers
 Found in file perl.c
@@ -775,7 +775,7 @@ X<perl_parse>
 
 Tells a Perl interpreter to parse a Perl script.  See L<perlembed>.
 
-	int	perl_parse(PerlInterpreter* interp, XSINIT_t xsinit, int argc, char** argv, char** env)
+	int	perl_parse(PerlInterpreter *my_perl, XSINIT_t xsinit, int argc, char** argv, char** env)
 
 =for hackers
 Found in file perl.c
@@ -785,7 +785,7 @@ X<perl_run>
 
 Tells a Perl interpreter to run.  See L<perlembed>.
 
-	int	perl_run(PerlInterpreter* interp)
+	int	perl_run(PerlInterpreter *my_perl)
 
 =for hackers
 Found in file perl.c
@@ -992,7 +992,7 @@ X<sv_catsv_mg>
 
 Like C<sv_catsv>, but also handles 'set' magic.
 
-	void	sv_catsv_mg(SV *dstr, SV *sstr)
+	void	sv_catsv_mg(SV *dsv, SV *ssv)
 
 =for hackers
 Found in file mathoms.c
@@ -1086,7 +1086,7 @@ A private implementation of the C<SvPVbyte> macro for compilers
 which can't cope with complex macro expressions. Always use the macro
 instead.
 
-	char*	sv_pvbyten(SV *sv, STRLEN *len)
+	char*	sv_pvbyten(SV *sv, STRLEN *lp)
 
 =for hackers
 Found in file mathoms.c
@@ -1097,7 +1097,7 @@ X<sv_pvn>
 A private implementation of the C<SvPV> macro for compilers which can't
 cope with complex macro expressions. Always use the macro instead.
 
-	char*	sv_pvn(SV *sv, STRLEN *len)
+	char*	sv_pvn(SV *sv, STRLEN *lp)
 
 =for hackers
 Found in file mathoms.c
@@ -1119,7 +1119,7 @@ A private implementation of the C<SvPVutf8> macro for compilers
 which can't cope with complex macro expressions. Always use the macro
 instead.
 
-	char*	sv_pvutf8n(SV *sv, STRLEN *len)
+	char*	sv_pvutf8n(SV *sv, STRLEN *lp)
 
 =for hackers
 Found in file mathoms.c
@@ -1603,7 +1603,7 @@ X<hv_assert>
 
 Check that a hash is in an internally consistent state.
 
-	void	hv_assert(HV* tb)
+	void	hv_assert(HV *hv)
 
 =for hackers
 Found in file hv.c
@@ -1613,7 +1613,7 @@ X<hv_clear>
 
 Clears a hash, making it empty.
 
-	void	hv_clear(HV* tb)
+	void	hv_clear(HV *hv)
 
 =for hackers
 Found in file hv.c
@@ -1629,7 +1629,7 @@ but will still allow the hash to have a value reassigned to the key at some
 future point.  This function clears any such placeholder keys from the hash.
 See Hash::Util::lock_keys() for an example of its use.
 
-	void	hv_clear_placeholders(HV* hb)
+	void	hv_clear_placeholders(HV *hv)
 
 =for hackers
 Found in file hv.c
@@ -1642,7 +1642,7 @@ hash and returned to the caller.  The C<klen> is the length of the key.
 The C<flags> value will normally be zero; if set to G_DISCARD then NULL
 will be returned.
 
-	SV*	hv_delete(HV* tb, const char* key, I32 klen, I32 flags)
+	SV*	hv_delete(HV *hv, const char *key, I32 klen, I32 flags)
 
 =for hackers
 Found in file hv.c
@@ -1655,7 +1655,7 @@ hash and returned to the caller.  The C<flags> value will normally be zero;
 if set to G_DISCARD then NULL will be returned.  C<hash> can be a valid
 precomputed hash value, or 0 to ask for it to be computed.
 
-	SV*	hv_delete_ent(HV* tb, SV* key, I32 flags, U32 hash)
+	SV*	hv_delete_ent(HV *hv, SV *keysv, I32 flags, U32 hash)
 
 =for hackers
 Found in file hv.c
@@ -1666,7 +1666,7 @@ X<hv_exists>
 Returns a boolean indicating whether the specified hash key exists.  The
 C<klen> is the length of the key.
 
-	bool	hv_exists(HV* tb, const char* key, I32 klen)
+	bool	hv_exists(HV *hv, const char *key, I32 klen)
 
 =for hackers
 Found in file hv.c
@@ -1678,7 +1678,7 @@ Returns a boolean indicating whether the specified hash key exists. C<hash>
 can be a valid precomputed hash value, or 0 to ask for it to be
 computed.
 
-	bool	hv_exists_ent(HV* tb, SV* key, U32 hash)
+	bool	hv_exists_ent(HV *hv, SV *keysv, U32 hash)
 
 =for hackers
 Found in file hv.c
@@ -1694,7 +1694,7 @@ dereferencing it to an C<SV*>.
 See L<perlguts/"Understanding the Magic of Tied Hashes and Arrays"> for more
 information on how to use this function on tied hashes.
 
-	SV**	hv_fetch(HV* tb, const char* key, I32 klen, I32 lval)
+	SV**	hv_fetch(HV *hv, const char *key, I32 klen, I32 lval)
 
 =for hackers
 Found in file hv.c
@@ -1723,7 +1723,7 @@ store it somewhere.
 See L<perlguts/"Understanding the Magic of Tied Hashes and Arrays"> for more
 information on how to use this function on tied hashes.
 
-	HE*	hv_fetch_ent(HV* tb, SV* key, I32 lval, U32 hash)
+	HE*	hv_fetch_ent(HV *hv, SV *keysv, I32 lval, U32 hash)
 
 =for hackers
 Found in file hv.c
@@ -1740,7 +1740,7 @@ hash buckets that happen to be in use.  If you still need that esoteric
 value, you can get it through the macro C<HvFILL(tb)>.
 
 
-	I32	hv_iterinit(HV* tb)
+	I32	hv_iterinit(HV *hv)
 
 =for hackers
 Found in file hv.c
@@ -1781,7 +1781,7 @@ to free the entry on the next call to C<hv_iternext>, so you must not discard
 your iterator immediately else the entry will leak - call C<hv_iternext> to
 trigger the resource deallocation.
 
-	HE*	hv_iternext(HV* tb)
+	HE*	hv_iternext(HV *hv)
 
 =for hackers
 Found in file hv.c
@@ -1792,7 +1792,7 @@ X<hv_iternextsv>
 Performs an C<hv_iternext>, C<hv_iterkey>, and C<hv_iterval> in one
 operation.
 
-	SV*	hv_iternextsv(HV* hv, char** key, I32* retlen)
+	SV*	hv_iternextsv(HV *hv, char **key, I32 *retlen)
 
 =for hackers
 Found in file hv.c
@@ -1812,7 +1812,7 @@ insufficiently abstracted for any change to be tidy.
 NOTE: this function is experimental and may change or be
 removed without notice.
 
-	HE*	hv_iternext_flags(HV* tb, I32 flags)
+	HE*	hv_iternext_flags(HV *hv, I32 flags)
 
 =for hackers
 Found in file hv.c
@@ -1823,7 +1823,7 @@ X<hv_iterval>
 Returns the value from the current position of the hash iterator.  See
 C<hv_iterkey>.
 
-	SV*	hv_iterval(HV* tb, HE* entry)
+	SV*	hv_iterval(HV *hv, HE *entry)
 
 =for hackers
 Found in file hv.c
@@ -1833,7 +1833,7 @@ X<hv_magic>
 
 Adds magic to a hash.  See C<sv_magic>.
 
-	void	hv_magic(HV* hv, GV* gv, int how)
+	void	hv_magic(HV *hv, GV *gv, int how)
 
 =for hackers
 Found in file hv.c
@@ -1843,7 +1843,7 @@ X<hv_scalar>
 
 Evaluates the hash in scalar context and returns the result. Handles magic when the hash is tied.
 
-	SV*	hv_scalar(HV* hv)
+	SV*	hv_scalar(HV *hv)
 
 =for hackers
 Found in file hv.c
@@ -1871,7 +1871,7 @@ hv_store_ent.
 See L<perlguts/"Understanding the Magic of Tied Hashes and Arrays"> for more
 information on how to use this function on tied hashes.
 
-	SV**	hv_store(HV* tb, const char* key, I32 klen, SV* val, U32 hash)
+	SV**	hv_store(HV *hv, const char *key, I32 klen, SV *val, U32 hash)
 
 =for hackers
 Found in file hv.c
@@ -1913,7 +1913,7 @@ hv_store in preference to hv_store_ent.
 See L<perlguts/"Understanding the Magic of Tied Hashes and Arrays"> for more
 information on how to use this function on tied hashes.
 
-	HE*	hv_store_ent(HV* tb, SV* key, SV* val, U32 hash)
+	HE*	hv_store_ent(HV *hv, SV *key, SV *val, U32 hash)
 
 =for hackers
 Found in file hv.c
@@ -1923,7 +1923,7 @@ X<hv_undef>
 
 Undefines the hash.
 
-	void	hv_undef(HV* tb)
+	void	hv_undef(HV *hv)
 
 =for hackers
 Found in file hv.c
@@ -1960,7 +1960,7 @@ X<mg_copy>
 
 Copies the magic from one SV to another.  See C<sv_magic>.
 
-	int	mg_copy(SV* sv, SV* nsv, const char* key, I32 klen)
+	int	mg_copy(SV *sv, SV *nsv, const char *key, I32 klen)
 
 =for hackers
 Found in file mg.c
@@ -2413,7 +2413,7 @@ C<strend>.  It returns C<NULL> if the string can't be found.  The C<sv>
 does not have to be fbm_compiled, but the search will not be as fast
 then.
 
-	char*	fbm_instr(unsigned char* big, unsigned char* bigend, SV* littlesv, U32 flags)
+	char*	fbm_instr(unsigned char* big, unsigned char* bigend, SV* littlestr, U32 flags)
 
 =for hackers
 Found in file util.c
@@ -2524,7 +2524,7 @@ is an alpha version).  The boolean qv denotes that the version
 should be interpreted as if it had multiple decimals, even if
 it doesn't.
 
-	const char*	scan_version(const char *vstr, SV *sv, bool qv)
+	const char*	scan_version(const char *s, SV *rv, bool qv)
 
 =for hackers
 Found in file util.c
@@ -2665,7 +2665,7 @@ X<vcmp>
 Version object aware cmp.  Both operands must already have been 
 converted into version objects.
 
-	int	vcmp(SV *lvs, SV *rvs)
+	int	vcmp(SV *lhv, SV *rhv)
 
 =for hackers
 Found in file util.c
@@ -5511,7 +5511,7 @@ C<len> indicates number of bytes to copy.  If the SV has the UTF-8
 status set, then the bytes appended should be valid UTF-8.
 Handles 'get' magic, but not 'set' magic.  See C<sv_catpvn_mg>.
 
-	void	sv_catpvn(SV* sv, const char* ptr, STRLEN len)
+	void	sv_catpvn(SV *dsv, const char *sstr, STRLEN len)
 
 =for hackers
 Found in file sv.c
@@ -5526,7 +5526,7 @@ If C<flags> has C<SV_GMAGIC> bit set, will C<mg_get> on C<dsv> if
 appropriate, else not. C<sv_catpvn> and C<sv_catpvn_nomg> are implemented
 in terms of this function.
 
-	void	sv_catpvn_flags(SV* sv, const char* ptr, STRLEN len, I32 flags)
+	void	sv_catpvn_flags(SV *dstr, const char *sstr, STRLEN len, I32 flags)
 
 =for hackers
 Found in file sv.c
@@ -5558,7 +5558,7 @@ Concatenates the string from SV C<ssv> onto the end of the string in
 SV C<dsv>.  Modifies C<dsv> but not C<ssv>.  Handles 'get' magic, but
 not 'set' magic.  See C<sv_catsv_mg>.
 
-	void	sv_catsv(SV* dsv, SV* ssv)
+	void	sv_catsv(SV *dstr, SV *sstr)
 
 =for hackers
 Found in file sv.c
@@ -5757,7 +5757,7 @@ X<sv_insert>
 Inserts a string at the specified offset/length within the SV. Similar to
 the Perl substr() function.
 
-	void	sv_insert(SV* bigsv, STRLEN offset, STRLEN len, const char* little, STRLEN littlelen)
+	void	sv_insert(SV *bigstr, STRLEN offset, STRLEN len, const char *little, STRLEN littlelen)
 
 =for hackers
 Found in file sv.c
@@ -6236,7 +6236,7 @@ You probably want to use one of the assortment of wrappers, such as
 C<SvSetSV>, C<SvSetSV_nosteal>, C<SvSetMagicSV> and
 C<SvSetMagicSV_nosteal>.
 
-	void	sv_setsv(SV* dsv, SV* ssv)
+	void	sv_setsv(SV *dstr, SV *sstr)
 
 =for hackers
 Found in file sv.c
@@ -6261,7 +6261,7 @@ C<SvSetMagicSV_nosteal>.
 This is the primary function for copying scalars, and most other
 copy-ish functions and macros use this underneath.
 
-	void	sv_setsv_flags(SV* dsv, SV* ssv, I32 flags)
+	void	sv_setsv_flags(SV *dstr, SV *sstr, I32 flags)
 
 =for hackers
 Found in file sv.c
@@ -6339,7 +6339,7 @@ C<SV_IMMEDIATE_UNREF> to force the reference count to be decremented
 different from one or the reference being a readonly SV).
 See C<SvROK_off>.
 
-	void	sv_unref_flags(SV* sv, U32 flags)
+	void	sv_unref_flags(SV *ref, U32 flags)
 
 =for hackers
 Found in file sv.c
@@ -6614,7 +6614,7 @@ For case-insensitiveness, the "casefolding" of Unicode is used
 instead of upper/lowercasing both the characters, see
 http://www.unicode.org/unicode/reports/tr21/ (Case Mappings).
 
-	I32	ibcmp_utf8(const char* a, char **pe1, UV l1, bool u1, const char* b, char **pe2, UV l2, bool u2)
+	I32	ibcmp_utf8(const char *s1, char **pe1, UV l1, bool u1, const char *s2, char **pe2, UV l2, bool u2)
 
 =for hackers
 Found in file utf8.c
@@ -6627,7 +6627,7 @@ character.  Note that an INVARIANT (i.e. ASCII) character is a valid
 UTF-8 character.  The actual number of bytes in the UTF-8 character
 will be returned if it is valid, otherwise 0.
 
-	STRLEN	is_utf8_char(const U8 *p)
+	STRLEN	is_utf8_char(const U8 *s)
 
 =for hackers
 Found in file utf8.c
diff --git a/pod/perlintern.pod b/pod/perlintern.pod
index 3b2b155..ac6f082 100644
--- a/pod/perlintern.pod
+++ b/pod/perlintern.pod
@@ -421,7 +421,7 @@ perl on VMS). This code used to be inline, but now perl uses C<File::Glob>
 this glob starter is only used by miniperl during the build process.
 Moving it away shrinks pp_hot.c; shrinking pp_hot.c helps speed perl up.
 
-	PerlIO*	start_glob(SV* pattern, IO *io)
+	PerlIO*	start_glob(SV *tmpglob, IO *io)
 
 =for hackers
 Found in file doio.c
diff --git a/proto.h b/proto.h
index d7caaf1..10918f1 100644
--- a/proto.h
+++ b/proto.h
@@ -19,7 +19,7 @@
 START_EXTERN_C
 
 #if defined(PERL_IMPLICIT_SYS)
-PERL_CALLCONV PerlInterpreter*	perl_alloc_using(struct IPerlMem* m, struct IPerlMem* ms, struct IPerlMem* mp, struct IPerlEnv* e, struct IPerlStdIO* io, struct IPerlLIO* lio, struct IPerlDir* d, struct IPerlSock* s, struct IPerlProc* p)
+PERL_CALLCONV PerlInterpreter*	perl_alloc_using(struct IPerlMem *ipM, struct IPerlMem *ipMS, struct IPerlMem *ipMP, struct IPerlEnv *ipE, struct IPerlStdIO *ipStd, struct IPerlLIO *ipLio, struct IPerlDir *ipD, struct IPerlSock *ipS, struct IPerlProc *ipP)
 			__attribute__nonnull__(1)
 			__attribute__nonnull__(2)
 			__attribute__nonnull__(3)
@@ -32,30 +32,30 @@ PERL_CALLCONV PerlInterpreter*	perl_alloc_using(struct IPerlMem* m, struct IPerl
 
 #endif
 PERL_CALLCONV PerlInterpreter*	perl_alloc(void);
-PERL_CALLCONV void	perl_construct(PerlInterpreter* interp)
+PERL_CALLCONV void	perl_construct(PerlInterpreter *my_perl)
 			__attribute__nonnull__(1);
 
-PERL_CALLCONV int	perl_destruct(PerlInterpreter* interp)
+PERL_CALLCONV int	perl_destruct(PerlInterpreter *my_perl)
 			__attribute__nonnull__(1);
 
-PERL_CALLCONV void	perl_free(PerlInterpreter* interp)
+PERL_CALLCONV void	perl_free(PerlInterpreter *my_perl)
 			__attribute__nonnull__(1);
 
-PERL_CALLCONV int	perl_run(PerlInterpreter* interp)
+PERL_CALLCONV int	perl_run(PerlInterpreter *my_perl)
 			__attribute__nonnull__(1);
 
-PERL_CALLCONV int	perl_parse(PerlInterpreter* interp, XSINIT_t xsinit, int argc, char** argv, char** env)
+PERL_CALLCONV int	perl_parse(PerlInterpreter *my_perl, XSINIT_t xsinit, int argc, char** argv, char** env)
 			__attribute__nonnull__(1);
 
 PERL_CALLCONV bool	Perl_doing_taint(int argc, char** argv, char** env)
 			__attribute__warn_unused_result__;
 
 #if defined(USE_ITHREADS)
-PERL_CALLCONV PerlInterpreter*	perl_clone(PerlInterpreter* interp, UV flags)
+PERL_CALLCONV PerlInterpreter*	perl_clone(PerlInterpreter *proto_perl, UV flags)
 			__attribute__nonnull__(1);
 
 #  if defined(PERL_IMPLICIT_SYS)
-PERL_CALLCONV PerlInterpreter*	perl_clone_using(PerlInterpreter *interp, UV flags, struct IPerlMem* m, struct IPerlMem* ms, struct IPerlMem* mp, struct IPerlEnv* e, struct IPerlStdIO* io, struct IPerlLIO* lio, struct IPerlDir* d, struct IPerlSock* s, struct IPerlProc* p)
+PERL_CALLCONV PerlInterpreter*	perl_clone_using(PerlInterpreter *proto_perl, UV flags, struct IPerlMem* m, struct IPerlMem* ms, struct IPerlMem* mp, struct IPerlEnv* e, struct IPerlStdIO* io, struct IPerlLIO* lio, struct IPerlDir* d, struct IPerlSock* s, struct IPerlProc* p)
 			__attribute__nonnull__(1)
 			__attribute__nonnull__(3)
 			__attribute__nonnull__(4)
@@ -123,73 +123,73 @@ PERL_CALLCONV void	Perl_apply_attrs_string(pTHX_ const char *stashpv, CV *cv, co
 			__attribute__nonnull__(pTHX_2)
 			__attribute__nonnull__(pTHX_3);
 
-PERL_CALLCONV void	Perl_av_clear(pTHX_ AV* ar)
+PERL_CALLCONV void	Perl_av_clear(pTHX_ AV *av)
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV SV*	Perl_av_delete(pTHX_ AV* ar, I32 key, I32 flags)
+PERL_CALLCONV SV*	Perl_av_delete(pTHX_ AV *av, I32 key, I32 flags)
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV bool	Perl_av_exists(pTHX_ AV* ar, I32 key)
+PERL_CALLCONV bool	Perl_av_exists(pTHX_ AV *av, I32 key)
 			__attribute__warn_unused_result__
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV void	Perl_av_extend(pTHX_ AV* ar, I32 key)
+PERL_CALLCONV void	Perl_av_extend(pTHX_ AV *av, I32 key)
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV AV*	Perl_av_fake(pTHX_ I32 size, SV** svp)
+PERL_CALLCONV AV*	Perl_av_fake(pTHX_ I32 size, SV **strp)
 			__attribute__warn_unused_result__
 			__attribute__nonnull__(pTHX_2);
 
-PERL_CALLCONV SV**	Perl_av_fetch(pTHX_ AV* ar, I32 key, I32 lval)
+PERL_CALLCONV SV**	Perl_av_fetch(pTHX_ AV *av, I32 key, I32 lval)
 			__attribute__warn_unused_result__
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV void	Perl_av_fill(pTHX_ AV* ar, I32 fill)
+PERL_CALLCONV void	Perl_av_fill(pTHX_ AV *av, I32 fill)
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV I32	Perl_av_len(pTHX_ const AV* ar)
+PERL_CALLCONV I32	Perl_av_len(pTHX_ const AV *av)
 			__attribute__warn_unused_result__
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV AV*	Perl_av_make(pTHX_ I32 size, SV** svp)
+PERL_CALLCONV AV*	Perl_av_make(pTHX_ I32 size, SV **strp)
 			__attribute__warn_unused_result__
 			__attribute__nonnull__(pTHX_2);
 
-PERL_CALLCONV SV*	Perl_av_pop(pTHX_ AV* ar)
+PERL_CALLCONV SV*	Perl_av_pop(pTHX_ AV *av)
 			__attribute__nonnull__(pTHX_1);
 
 PERL_CALLCONV void	Perl_av_create_and_push(pTHX_ AV **const avp, SV *const val)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2);
 
-PERL_CALLCONV void	Perl_av_push(pTHX_ AV* ar, SV* val)
+PERL_CALLCONV void	Perl_av_push(pTHX_ AV *av, SV *val)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2);
 
-PERL_CALLCONV void	Perl_av_reify(pTHX_ AV* ar)
+PERL_CALLCONV void	Perl_av_reify(pTHX_ AV *av)
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV SV*	Perl_av_shift(pTHX_ AV* ar)
+PERL_CALLCONV SV*	Perl_av_shift(pTHX_ AV *av)
 			__attribute__warn_unused_result__
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV SV**	Perl_av_store(pTHX_ AV* ar, I32 key, SV* val)
+PERL_CALLCONV SV**	Perl_av_store(pTHX_ AV *av, I32 key, SV *val)
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV void	Perl_av_undef(pTHX_ AV* ar)
+PERL_CALLCONV void	Perl_av_undef(pTHX_ AV *av)
 			__attribute__nonnull__(pTHX_1);
 
 PERL_CALLCONV SV**	Perl_av_create_and_unshift_one(pTHX_ AV **const avp, SV *const val)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2);
 
-PERL_CALLCONV void	Perl_av_unshift(pTHX_ AV* ar, I32 num)
+PERL_CALLCONV void	Perl_av_unshift(pTHX_ AV *av, I32 num)
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV SV**	Perl_av_arylen_p(pTHX_ AV* av)
+PERL_CALLCONV SV**	Perl_av_arylen_p(pTHX_ AV *av)
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV IV*	Perl_av_iter_p(pTHX_ AV* av)
+PERL_CALLCONV IV*	Perl_av_iter_p(pTHX_ AV *av)
 			__attribute__nonnull__(pTHX_1);
 
 #if defined(PERL_IN_AV_C) || defined(PERL_DECL_PROT)
@@ -197,7 +197,7 @@ STATIC MAGIC*	S_get_aux_mg(pTHX_ AV *av)
 			__attribute__nonnull__(pTHX_1);
 
 #endif
-PERL_CALLCONV OP*	Perl_bind_match(pTHX_ I32 type, OP* left, OP* pat)
+PERL_CALLCONV OP*	Perl_bind_match(pTHX_ I32 type, OP *left, OP *right)
 			__attribute__warn_unused_result__
 			__attribute__nonnull__(pTHX_2)
 			__attribute__nonnull__(pTHX_3);
@@ -213,7 +213,7 @@ PERL_CALLCONV int	Perl_block_start(pTHX_ int full)
 
 PERL_CALLCONV void	Perl_boot_core_UNIVERSAL(pTHX);
 PERL_CALLCONV void	Perl_boot_core_PerlIO(pTHX);
-PERL_CALLCONV void	Perl_call_list(pTHX_ I32 oldscope, AV* av_list)
+PERL_CALLCONV void	Perl_call_list(pTHX_ I32 oldscope, AV *paramList)
 			__attribute__nonnull__(pTHX_2);
 
 PERL_CALLCONV bool	Perl_cando(pTHX_ Mode_t mode, bool effective, const Stat_t* statbufp)
@@ -305,12 +305,12 @@ PERL_CALLCONV void	Perl_sv_setpvf_mg_nocontext(SV* sv, const char* pat, ...)
 			__attribute__nonnull__(1)
 			__attribute__nonnull__(2);
 
-PERL_CALLCONV int	Perl_fprintf_nocontext(PerlIO* stream, const char* fmt, ...)
+PERL_CALLCONV int	Perl_fprintf_nocontext(PerlIO *stream, const char *format, ...)
 			__attribute__format__(__printf__,2,3)
 			__attribute__nonnull__(1)
 			__attribute__nonnull__(2);
 
-PERL_CALLCONV int	Perl_printf_nocontext(const char* fmt, ...)
+PERL_CALLCONV int	Perl_printf_nocontext(const char *format, ...)
 			__attribute__format__(__printf__,1,2)
 			__attribute__nonnull__(1);
 
@@ -344,7 +344,7 @@ PERL_CALLCONV SV*	Perl_filter_add(pTHX_ filter_t funcp, SV* datasv);
 PERL_CALLCONV void	Perl_filter_del(pTHX_ filter_t funcp)
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV I32	Perl_filter_read(pTHX_ int idx, SV* buffer, int maxlen)
+PERL_CALLCONV I32	Perl_filter_read(pTHX_ int idx, SV *buf_sv, int maxlen)
 			__attribute__warn_unused_result__
 			__attribute__nonnull__(pTHX_2);
 
@@ -415,7 +415,7 @@ PERL_CALLCONV bool	Perl_do_aexec5(pTHX_ SV* really, SV** mark, SV** sp, int fd,
 PERL_CALLCONV int	Perl_do_binmode(pTHX_ PerlIO *fp, int iotype, int mode)
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV void	Perl_do_chop(pTHX_ SV* asv, SV* sv)
+PERL_CALLCONV void	Perl_do_chop(pTHX_ SV *astr, SV *sv)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2);
 
@@ -448,7 +448,7 @@ PERL_CALLCONV int	Perl_do_spawn_nowait(pTHX_ char* cmd)
 
 #endif
 #if !defined(WIN32)
-PERL_CALLCONV bool	Perl_do_exec3(pTHX_ const char* cmd, int fd, int do_report)
+PERL_CALLCONV bool	Perl_do_exec3(pTHX_ const char *incmd, int fd, int do_report)
 			__attribute__nonnull__(pTHX_1);
 
 #endif
@@ -484,7 +484,7 @@ PERL_CALLCONV I32	Perl_do_shmio(pTHX_ I32 optype, SV** mark, SV** sp)
 			__attribute__nonnull__(pTHX_3);
 
 #endif
-PERL_CALLCONV void	Perl_do_join(pTHX_ SV* sv, SV* del, SV** mark, SV** sp)
+PERL_CALLCONV void	Perl_do_join(pTHX_ SV *sv, SV *delim, SV **mark, SV **sp)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2)
 			__attribute__nonnull__(pTHX_3)
@@ -500,7 +500,7 @@ PERL_CALLCONV bool	Perl_do_open9(pTHX_ GV *gv, const char *name, I32 len, int as
 			__attribute__nonnull__(pTHX_2)
 			__attribute__nonnull__(pTHX_8);
 
-PERL_CALLCONV bool	Perl_do_openn(pTHX_ GV *gv, const char *name, I32 len, int as_raw, int rawmode, int rawperm, PerlIO *supplied_fp, SV **svp, I32 num)
+PERL_CALLCONV bool	Perl_do_openn(pTHX_ GV *gv, const char *oname, I32 len, int as_raw, int rawmode, int rawperm, PerlIO *supplied_fp, SV **svp, I32 num)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2);
 
@@ -558,7 +558,7 @@ PERL_CALLCONV void	Perl_dump_form(pTHX_ const GV* gv)
 PERL_CALLCONV void	Perl_gv_dump(pTHX_ GV* gv)
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV void	Perl_op_dump(pTHX_ const OP* arg)
+PERL_CALLCONV void	Perl_op_dump(pTHX_ const OP *o)
 			__attribute__nonnull__(pTHX_1);
 
 PERL_CALLCONV void	Perl_pmop_dump(pTHX_ PMOP* pm);
@@ -581,7 +581,7 @@ PERL_CALLCONV char*	Perl_find_script(pTHX_ const char *scriptname, bool dosearch
 			__attribute__nonnull__(pTHX_1);
 
 PERL_CALLCONV OP*	Perl_force_list(pTHX_ OP* arg);
-PERL_CALLCONV OP*	Perl_fold_constants(pTHX_ OP* arg)
+PERL_CALLCONV OP*	Perl_fold_constants(pTHX_ OP *o)
 			__attribute__nonnull__(pTHX_1);
 
 PERL_CALLCONV char*	Perl_form(pTHX_ const char* pat, ...)
@@ -650,7 +650,7 @@ PERL_CALLCONV GV*	Perl_gv_fetchmeth_autoload(pTHX_ HV* stash, const char* name,
 PERL_CALLCONV GV*	Perl_gv_fetchmethod_autoload(pTHX_ HV* stash, const char* name, I32 autoload)
 			__attribute__nonnull__(pTHX_2);
 
-PERL_CALLCONV GV*	Perl_gv_fetchpv(pTHX_ const char* name, I32 add, I32 sv_type)
+PERL_CALLCONV GV*	Perl_gv_fetchpv(pTHX_ const char *nambeg, I32 add, I32 sv_type)
 			__attribute__nonnull__(pTHX_1);
 
 PERL_CALLCONV void	Perl_gv_fullname(pTHX_ SV* sv, const GV* gv)
@@ -685,39 +685,39 @@ PERL_CALLCONV HV*	Perl_gv_stashpvn(pTHX_ const char* name, U32 namelen, I32 flag
 PERL_CALLCONV HV*	Perl_gv_stashsv(pTHX_ SV* sv, I32 flags)
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV void	Perl_hv_clear(pTHX_ HV* tb);
+PERL_CALLCONV void	Perl_hv_clear(pTHX_ HV *hv);
 PERL_CALLCONV HV *	Perl_hv_copy_hints_hv(pTHX_ HV *const ohv);
-PERL_CALLCONV void	Perl_hv_delayfree_ent(pTHX_ HV* hv, HE* entry)
+PERL_CALLCONV void	Perl_hv_delayfree_ent(pTHX_ HV *hv, HE *entry)
 			__attribute__nonnull__(pTHX_1);
 
-/* PERL_CALLCONV SV*	Perl_hv_delete(pTHX_ HV* tb, const char* key, I32 klen, I32 flags)
+/* PERL_CALLCONV SV*	Perl_hv_delete(pTHX_ HV *hv, const char *key, I32 klen, I32 flags)
 			__attribute__nonnull__(pTHX_2); */
 
-/* PERL_CALLCONV SV*	Perl_hv_delete_ent(pTHX_ HV* tb, SV* key, I32 flags, U32 hash)
+/* PERL_CALLCONV SV*	Perl_hv_delete_ent(pTHX_ HV *hv, SV *keysv, I32 flags, U32 hash)
 			__attribute__nonnull__(pTHX_2); */
 
-/* PERL_CALLCONV bool	Perl_hv_exists(pTHX_ HV* tb, const char* key, I32 klen)
+/* PERL_CALLCONV bool	Perl_hv_exists(pTHX_ HV *hv, const char *key, I32 klen)
 			__attribute__warn_unused_result__
 			__attribute__nonnull__(pTHX_2); */
 
-/* PERL_CALLCONV bool	Perl_hv_exists_ent(pTHX_ HV* tb, SV* key, U32 hash)
+/* PERL_CALLCONV bool	Perl_hv_exists_ent(pTHX_ HV *hv, SV *keysv, U32 hash)
 			__attribute__warn_unused_result__
 			__attribute__nonnull__(pTHX_2); */
 
-/* PERL_CALLCONV SV**	Perl_hv_fetch(pTHX_ HV* tb, const char* key, I32 klen, I32 lval)
+/* PERL_CALLCONV SV**	Perl_hv_fetch(pTHX_ HV *hv, const char *key, I32 klen, I32 lval)
 			__attribute__nonnull__(pTHX_2); */
 
-/* PERL_CALLCONV HE*	Perl_hv_fetch_ent(pTHX_ HV* tb, SV* key, I32 lval, U32 hash)
+/* PERL_CALLCONV HE*	Perl_hv_fetch_ent(pTHX_ HV *hv, SV *keysv, I32 lval, U32 hash)
 			__attribute__nonnull__(pTHX_2); */
 
-PERL_CALLCONV void*	Perl_hv_common(pTHX_ HV* tb, SV* keysv, const char* key, STRLEN klen, int flags, int action, SV* val, U32 hash);
+PERL_CALLCONV void*	Perl_hv_common(pTHX_ HV *hv, SV *keysv, const char* key, STRLEN klen, int flags, int action, SV *val, U32 hash);
 PERL_CALLCONV void*	Perl_hv_common_key_len(pTHX_ HV *hv, const char *key, I32 klen_i32, const int action, SV *val, const U32 hash)
 			__attribute__nonnull__(pTHX_2);
 
-PERL_CALLCONV void	Perl_hv_free_ent(pTHX_ HV* hv, HE* entryK)
+PERL_CALLCONV void	Perl_hv_free_ent(pTHX_ HV *hv, HE *entryK)
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV I32	Perl_hv_iterinit(pTHX_ HV* tb)
+PERL_CALLCONV I32	Perl_hv_iterinit(pTHX_ HV *hv)
 			__attribute__nonnull__(pTHX_1);
 
 PERL_CALLCONV char*	Perl_hv_iterkey(pTHX_ HE* entry, I32* retlen)
@@ -729,39 +729,39 @@ PERL_CALLCONV SV*	Perl_hv_iterkeysv(pTHX_ HE* entry)
 			__attribute__warn_unused_result__
 			__attribute__nonnull__(pTHX_1);
 
-/* PERL_CALLCONV HE*	Perl_hv_iternext(pTHX_ HV* tb)
+/* PERL_CALLCONV HE*	Perl_hv_iternext(pTHX_ HV *hv)
 			__attribute__warn_unused_result__
 			__attribute__nonnull__(pTHX_1); */
 
-PERL_CALLCONV SV*	Perl_hv_iternextsv(pTHX_ HV* hv, char** key, I32* retlen)
+PERL_CALLCONV SV*	Perl_hv_iternextsv(pTHX_ HV *hv, char **key, I32 *retlen)
 			__attribute__warn_unused_result__
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2)
 			__attribute__nonnull__(pTHX_3);
 
-PERL_CALLCONV HE*	Perl_hv_iternext_flags(pTHX_ HV* tb, I32 flags)
+PERL_CALLCONV HE*	Perl_hv_iternext_flags(pTHX_ HV *hv, I32 flags)
 			__attribute__warn_unused_result__
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV SV*	Perl_hv_iterval(pTHX_ HV* tb, HE* entry)
+PERL_CALLCONV SV*	Perl_hv_iterval(pTHX_ HV *hv, HE *entry)
 			__attribute__warn_unused_result__
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2);
 
-PERL_CALLCONV void	Perl_hv_ksplit(pTHX_ HV* hv, IV newmax)
+PERL_CALLCONV void	Perl_hv_ksplit(pTHX_ HV *hv, IV newmax)
 			__attribute__nonnull__(pTHX_1);
 
-/* PERL_CALLCONV void	Perl_hv_magic(pTHX_ HV* hv, GV* gv, int how)
+/* PERL_CALLCONV void	Perl_hv_magic(pTHX_ HV *hv, GV *gv, int how)
 			__attribute__nonnull__(pTHX_1); */
 
 PERL_CALLCONV HV *	Perl_refcounted_he_chain_2hv(pTHX_ const struct refcounted_he *c);
 PERL_CALLCONV SV *	Perl_refcounted_he_fetch(pTHX_ const struct refcounted_he *chain, SV *keysv, const char *key, STRLEN klen, int flags, U32 hash);
 PERL_CALLCONV void	Perl_refcounted_he_free(pTHX_ struct refcounted_he *he);
 PERL_CALLCONV struct refcounted_he *	Perl_refcounted_he_new(pTHX_ struct refcounted_he *const parent, SV *const key, SV *const value);
-/* PERL_CALLCONV SV**	Perl_hv_store(pTHX_ HV* tb, const char* key, I32 klen, SV* val, U32 hash); */
-/* PERL_CALLCONV HE*	Perl_hv_store_ent(pTHX_ HV* tb, SV* key, SV* val, U32 hash); */
-/* PERL_CALLCONV SV**	Perl_hv_store_flags(pTHX_ HV* tb, const char* key, I32 klen, SV* val, U32 hash, int flags); */
-PERL_CALLCONV void	Perl_hv_undef(pTHX_ HV* tb);
+/* PERL_CALLCONV SV**	Perl_hv_store(pTHX_ HV *hv, const char *key, I32 klen, SV *val, U32 hash); */
+/* PERL_CALLCONV HE*	Perl_hv_store_ent(pTHX_ HV *hv, SV *key, SV *val, U32 hash); */
+/* PERL_CALLCONV SV**	Perl_hv_store_flags(pTHX_ HV *hv, const char *key, I32 klen, SV *val, U32 hash, int flags); */
+PERL_CALLCONV void	Perl_hv_undef(pTHX_ HV *hv);
 PERL_CALLCONV I32	Perl_ibcmp(pTHX_ const char* a, const char* b, I32 len)
 			__attribute__pure__
 			__attribute__nonnull__(pTHX_1)
@@ -772,7 +772,7 @@ PERL_CALLCONV I32	Perl_ibcmp_locale(pTHX_ const char* a, const char* b, I32 len)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2);
 
-PERL_CALLCONV I32	Perl_ibcmp_utf8(pTHX_ const char* a, char **pe1, UV l1, bool u1, const char* b, char **pe2, UV l2, bool u2)
+PERL_CALLCONV I32	Perl_ibcmp_utf8(pTHX_ const char *s1, char **pe1, UV l1, bool u1, const char *s2, char **pe2, UV l2, bool u2)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_5);
 
@@ -947,7 +947,7 @@ PERL_CALLCONV bool	Perl_is_uni_xdigit_lc(pTHX_ UV c)
 			__attribute__warn_unused_result__
 			__attribute__pure__;
 
-PERL_CALLCONV STRLEN	Perl_is_utf8_char(pTHX_ const U8 *p)
+PERL_CALLCONV STRLEN	Perl_is_utf8_char(pTHX_ const U8 *s)
 			__attribute__nonnull__(pTHX_1);
 
 PERL_CALLCONV bool	Perl_is_utf8_string(pTHX_ const U8 *s, STRLEN len)
@@ -1023,10 +1023,10 @@ PERL_CALLCONV bool	Perl_is_utf8_mark(pTHX_ const U8 *p)
 			__attribute__warn_unused_result__
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV OP*	Perl_jmaybe(pTHX_ OP* arg)
+PERL_CALLCONV OP*	Perl_jmaybe(pTHX_ OP *o)
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV I32	Perl_keyword(pTHX_ const char* d, I32 len, bool all_keywords)
+PERL_CALLCONV I32	Perl_keyword(pTHX_ const char *name, I32 len, bool all_keywords)
 			__attribute__pure__
 			__attribute__nonnull__(pTHX_1);
 
@@ -1052,7 +1052,7 @@ PERL_CALLCONV void	Perl_load_module(pTHX_ U32 flags, SV* name, SV* ver, ...)
 PERL_CALLCONV void	Perl_vload_module(pTHX_ U32 flags, SV* name, SV* ver, va_list* args)
 			__attribute__nonnull__(pTHX_2);
 
-PERL_CALLCONV OP*	Perl_localize(pTHX_ OP* arg, I32 lexical)
+PERL_CALLCONV OP*	Perl_localize(pTHX_ OP *o, I32 lex)
 			__attribute__nonnull__(pTHX_1);
 
 PERL_CALLCONV I32	Perl_looks_like_number(pTHX_ SV *const sv)
@@ -1162,7 +1162,7 @@ PERL_CALLCONV U32	Perl_magic_len(pTHX_ SV* sv, MAGIC* mg)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2);
 
-PERL_CALLCONV int	Perl_magic_nextpack(pTHX_ SV* sv, MAGIC* mg, SV* key)
+PERL_CALLCONV int	Perl_magic_nextpack(pTHX_ SV *sv, MAGIC *mg, SV *key)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2)
 			__attribute__nonnull__(pTHX_3);
@@ -1305,7 +1305,7 @@ PERL_CALLCONV void	Perl_sortsv_flags(pTHX_ SV** array, size_t num_elts, SVCOMPAR
 PERL_CALLCONV int	Perl_mg_clear(pTHX_ SV* sv)
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV int	Perl_mg_copy(pTHX_ SV* sv, SV* nsv, const char* key, I32 klen)
+PERL_CALLCONV int	Perl_mg_copy(pTHX_ SV *sv, SV *nsv, const char *key, I32 klen)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2);
 
@@ -1449,7 +1449,7 @@ PERL_CALLCONV OP*	Perl_newGIVENOP(pTHX_ OP* cond, OP* block, PADOFFSET defsv_off
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2);
 
-PERL_CALLCONV OP*	Perl_newLOGOP(pTHX_ I32 optype, I32 flags, OP* left, OP* right)
+PERL_CALLCONV OP*	Perl_newLOGOP(pTHX_ I32 optype, I32 flags, OP *first, OP *other)
 			__attribute__malloc__
 			__attribute__warn_unused_result__
 			__attribute__nonnull__(pTHX_3)
@@ -1494,7 +1494,7 @@ PERL_CALLCONV CV *	Perl_newXS_flags(pTHX_ const char *name, XSUBADDR_t subaddr,
 			__attribute__nonnull__(pTHX_2)
 			__attribute__nonnull__(pTHX_3);
 
-PERL_CALLCONV CV*	Perl_newXS(pTHX_ const char* name, XSUBADDR_t f, const char* filename)
+PERL_CALLCONV CV*	Perl_newXS(pTHX_ const char *name, XSUBADDR_t subaddr, const char *filename)
 			__attribute__nonnull__(pTHX_2)
 			__attribute__nonnull__(pTHX_3);
 
@@ -1536,7 +1536,7 @@ PERL_CALLCONV OP*	Perl_newHVREF(pTHX_ OP* o)
 /* PERL_CALLCONV HV*	Perl_newHV(pTHX)
 			__attribute__warn_unused_result__; */
 
-PERL_CALLCONV HV*	Perl_newHVhv(pTHX_ HV* hv)
+PERL_CALLCONV HV*	Perl_newHVhv(pTHX_ HV *hv)
 			__attribute__malloc__
 			__attribute__warn_unused_result__;
 
@@ -1658,7 +1658,7 @@ PERL_CALLCONV PERL_SI*	Perl_new_stackinfo(pTHX_ I32 stitems, I32 cxitems)
 			__attribute__malloc__
 			__attribute__warn_unused_result__;
 
-PERL_CALLCONV char*	Perl_scan_vstring(pTHX_ const char *vstr, const char *const end, SV *sv)
+PERL_CALLCONV char*	Perl_scan_vstring(pTHX_ const char *s, const char *const e, SV *sv)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2)
 			__attribute__nonnull__(pTHX_3);
@@ -1736,7 +1736,7 @@ PERL_CALLCONV void	Perl_pad_free(pTHX_ PADOFFSET po);
 PERL_CALLCONV void	Perl_pad_reset(pTHX);
 PERL_CALLCONV void	Perl_pad_swipe(pTHX_ PADOFFSET po, bool refadjust);
 PERL_CALLCONV void	Perl_peep(pTHX_ OP* o);
-PERL_CALLCONV PerlIO*	Perl_start_glob(pTHX_ SV* pattern, IO *io)
+PERL_CALLCONV PerlIO*	Perl_start_glob(pTHX_ SV *tmpglob, IO *io)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2);
 
@@ -1744,7 +1744,7 @@ PERL_CALLCONV PerlIO*	Perl_start_glob(pTHX_ SV* pattern, IO *io)
 PERL_CALLCONV void	Perl_reentrant_size(pTHX);
 PERL_CALLCONV void	Perl_reentrant_init(pTHX);
 PERL_CALLCONV void	Perl_reentrant_free(pTHX);
-PERL_CALLCONV void*	Perl_reentrant_retry(const char*, ...)
+PERL_CALLCONV void*	Perl_reentrant_retry(const char *f, ...)
 			__attribute__nonnull__(1);
 
 #endif
@@ -1821,7 +1821,7 @@ PERL_CALLCONV void	Perl_pidgone(pTHX_ Pid_t pid, int status);
 PERL_CALLCONV void	Perl_pmflag(pTHX_ U32* pmfl, int ch)
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV OP*	Perl_pmruntime(pTHX_ OP* pm, OP* expr, bool isreg)
+PERL_CALLCONV OP*	Perl_pmruntime(pTHX_ OP *o, OP *expr, bool isreg)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2);
 
@@ -1841,7 +1841,7 @@ PERL_CALLCONV void	Perl_regdump(pTHX_ const regexp* r)
 PERL_CALLCONV void	Perl_regdump(pTHX_ const regexp* r)
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV SV*	Perl_regclass_swash(pTHX_ const regexp *prog, const struct regnode *n, bool doinit, SV **listsvp, SV **altsvp)
+PERL_CALLCONV SV*	Perl_regclass_swash(pTHX_ const regexp *prog, const struct regnode *node, bool doinit, SV **listsvp, SV **altsvp)
 			__attribute__nonnull__(pTHX_2);
 
 PERL_CALLCONV I32	Perl_pregexec(pTHX_ REGEXP * const prog, char* stringarg, char* strend, char* strbeg, I32 minend, SV* screamer, U32 nosave)
@@ -1852,13 +1852,13 @@ PERL_CALLCONV I32	Perl_pregexec(pTHX_ REGEXP * const prog, char* stringarg, char
 			__attribute__nonnull__(pTHX_6);
 
 PERL_CALLCONV void	Perl_pregfree(pTHX_ REGEXP* r);
-PERL_CALLCONV void	Perl_pregfree2(pTHX_ REGEXP* prog)
+PERL_CALLCONV void	Perl_pregfree2(pTHX_ REGEXP *rx)
 			__attribute__nonnull__(pTHX_1);
 
 PERL_CALLCONV REGEXP*	Perl_reg_temp_copy(pTHX_ REGEXP* r)
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV void	Perl_regfree_internal(pTHX_ REGEXP * const rx)
+PERL_CALLCONV void	Perl_regfree_internal(pTHX_ REGEXP *const rx)
 			__attribute__nonnull__(pTHX_1);
 
 #if defined(USE_ITHREADS)
@@ -1878,10 +1878,10 @@ PERL_CALLCONV char*	Perl_re_intuit_start(pTHX_ REGEXP * const rx, SV* sv, char*
 			__attribute__nonnull__(pTHX_3)
 			__attribute__nonnull__(pTHX_4);
 
-PERL_CALLCONV SV*	Perl_re_intuit_string(pTHX_ REGEXP * const rx)
+PERL_CALLCONV SV*	Perl_re_intuit_string(pTHX_ REGEXP  *const r)
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV I32	Perl_regexec_flags(pTHX_ REGEXP * const rx, char* stringarg, char* strend, char* strbeg, I32 minend, SV* screamer, void* data, U32 flags)
+PERL_CALLCONV I32	Perl_regexec_flags(pTHX_ REGEXP *const rx, char *stringarg, char *strend, char *strbeg, I32 minend, SV *sv, void *data, U32 flags)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2)
 			__attribute__nonnull__(pTHX_3)
@@ -1958,11 +1958,11 @@ PERL_CALLCONV Sighandler_t	Perl_rsignal_state(pTHX_ int i);
 PERL_CALLCONV void	Perl_rxres_free(pTHX_ void** rsp)
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV void	Perl_rxres_restore(pTHX_ void** rsp, REGEXP* prx)
+PERL_CALLCONV void	Perl_rxres_restore(pTHX_ void **rsp, REGEXP *rx)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2);
 
-PERL_CALLCONV void	Perl_rxres_save(pTHX_ void** rsp, REGEXP* prx)
+PERL_CALLCONV void	Perl_rxres_save(pTHX_ void **rsp, REGEXP *rx)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2);
 
@@ -2013,7 +2013,7 @@ PERL_CALLCONV void	Perl_save_bool(pTHX_ bool* boolp)
 PERL_CALLCONV void	Perl_save_clearsv(pTHX_ SV** svp)
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV void	Perl_save_delete(pTHX_ HV* hv, char* key, I32 klen)
+PERL_CALLCONV void	Perl_save_delete(pTHX_ HV *hv, char *key, I32 klen)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2);
 
@@ -2039,7 +2039,7 @@ PERL_CALLCONV void	Perl_save_gp(pTHX_ GV* gv, I32 empty)
 PERL_CALLCONV HV*	Perl_save_hash(pTHX_ GV* gv)
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV void	Perl_save_helem(pTHX_ HV* hv, SV *key, SV **sptr)
+PERL_CALLCONV void	Perl_save_helem(pTHX_ HV *hv, SV *key, SV **sptr)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2)
 			__attribute__nonnull__(pTHX_3);
@@ -2062,7 +2062,7 @@ PERL_CALLCONV void	Perl_save_int(pTHX_ int* intp)
 PERL_CALLCONV void	Perl_save_item(pTHX_ SV* item)
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV void	Perl_save_iv(pTHX_ IV* iv)
+PERL_CALLCONV void	Perl_save_iv(pTHX_ IV *ivp)
 			__attribute__nonnull__(pTHX_1);
 
 PERL_CALLCONV void	Perl_save_list(pTHX_ SV** sarg, I32 maxsarg)
@@ -2084,7 +2084,7 @@ PERL_CALLCONV SV*	Perl_save_scalar(pTHX_ GV* gv)
 PERL_CALLCONV void	Perl_save_pptr(pTHX_ char** pptr)
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV void	Perl_save_vptr(pTHX_ void* pptr)
+PERL_CALLCONV void	Perl_save_vptr(pTHX_ void *ptr)
 			__attribute__nonnull__(pTHX_1);
 
 PERL_CALLCONV void	Perl_save_re_context(pTHX);
@@ -2195,15 +2195,15 @@ PERL_CALLCONV UV	Perl_sv_uv(pTHX_ SV* sv)
 PERL_CALLCONV NV	Perl_sv_nv(pTHX_ SV* sv)
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV char*	Perl_sv_pvn(pTHX_ SV *sv, STRLEN *len)
+PERL_CALLCONV char*	Perl_sv_pvn(pTHX_ SV *sv, STRLEN *lp)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2);
 
-PERL_CALLCONV char*	Perl_sv_pvutf8n(pTHX_ SV *sv, STRLEN *len)
+PERL_CALLCONV char*	Perl_sv_pvutf8n(pTHX_ SV *sv, STRLEN *lp)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2);
 
-PERL_CALLCONV char*	Perl_sv_pvbyten(pTHX_ SV *sv, STRLEN *len)
+PERL_CALLCONV char*	Perl_sv_pvbyten(pTHX_ SV *sv, STRLEN *lp)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2);
 
@@ -2230,11 +2230,11 @@ PERL_CALLCONV void	Perl_sv_vcatpvf(pTHX_ SV* sv, const char* pat, va_list* args)
 PERL_CALLCONV void	Perl_sv_catpv(pTHX_ SV* sv, const char* ptr)
 			__attribute__nonnull__(pTHX_1);
 
-/* PERL_CALLCONV void	Perl_sv_catpvn(pTHX_ SV* sv, const char* ptr, STRLEN len)
+/* PERL_CALLCONV void	Perl_sv_catpvn(pTHX_ SV *dsv, const char *sstr, STRLEN len)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2); */
 
-/* PERL_CALLCONV void	Perl_sv_catsv(pTHX_ SV* dsv, SV* ssv)
+/* PERL_CALLCONV void	Perl_sv_catsv(pTHX_ SV *dstr, SV *sstr)
 			__attribute__nonnull__(pTHX_1); */
 
 PERL_CALLCONV void	Perl_sv_chop(pTHX_ SV* sv, const char* ptr)
@@ -2253,7 +2253,7 @@ PERL_CALLCONV char*	Perl_sv_collxfrm(pTHX_ SV* sv, STRLEN* nxp)
 			__attribute__nonnull__(pTHX_2);
 
 #endif
-PERL_CALLCONV OP*	Perl_sv_compile_2op(pTHX_ SV* sv, OP** startp, const char* code, PAD** padp)
+PERL_CALLCONV OP*	Perl_sv_compile_2op(pTHX_ SV *sv, OP **startop, const char *code, PAD **padp)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2)
 			__attribute__nonnull__(pTHX_3)
@@ -2290,7 +2290,7 @@ PERL_CALLCONV char*	Perl_sv_grow(pTHX_ SV *const sv, STRLEN newlen)
 			__attribute__nonnull__(pTHX_1);
 
 PERL_CALLCONV void	Perl_sv_inc(pTHX_ SV* sv);
-PERL_CALLCONV void	Perl_sv_insert(pTHX_ SV* bigsv, STRLEN offset, STRLEN len, const char* little, STRLEN littlelen)
+PERL_CALLCONV void	Perl_sv_insert(pTHX_ SV *bigstr, STRLEN offset, STRLEN len, const char *little, STRLEN littlelen)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_4);
 
@@ -2396,7 +2396,7 @@ PERL_CALLCONV void	Perl_sv_setpv(pTHX_ SV* sv, const char* ptr)
 PERL_CALLCONV void	Perl_sv_setpvn(pTHX_ SV* sv, const char* ptr, STRLEN len)
 			__attribute__nonnull__(pTHX_1);
 
-/* PERL_CALLCONV void	Perl_sv_setsv(pTHX_ SV* dsv, SV* ssv)
+/* PERL_CALLCONV void	Perl_sv_setsv(pTHX_ SV *dstr, SV *sstr)
 			__attribute__nonnull__(pTHX_1); */
 
 /* PERL_CALLCONV void	Perl_sv_taint(pTHX_ SV* sv)
@@ -2412,7 +2412,7 @@ PERL_CALLCONV int	Perl_sv_unmagic(pTHX_ SV* sv, int type)
 /* PERL_CALLCONV void	Perl_sv_unref(pTHX_ SV* sv)
 			__attribute__nonnull__(pTHX_1); */
 
-PERL_CALLCONV void	Perl_sv_unref_flags(pTHX_ SV* sv, U32 flags)
+PERL_CALLCONV void	Perl_sv_unref_flags(pTHX_ SV *ref, U32 flags)
 			__attribute__nonnull__(pTHX_1);
 
 PERL_CALLCONV void	Perl_sv_untaint(pTHX_ SV* sv)
@@ -2689,7 +2689,7 @@ PERL_CALLCONV void	Perl_sv_catpv_mg(pTHX_ SV *sv, const char *ptr)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2); */
 
-/* PERL_CALLCONV void	Perl_sv_catsv_mg(pTHX_ SV *dstr, SV *sstr)
+/* PERL_CALLCONV void	Perl_sv_catsv_mg(pTHX_ SV *dsv, SV *ssv)
 			__attribute__nonnull__(pTHX_1); */
 
 PERL_CALLCONV void	Perl_sv_setpvf_mg(pTHX_ SV *sv, const char* pat, ...)
@@ -2931,11 +2931,11 @@ PERL_CALLCONV void	Perl_sys_intern_clear(pTHX);
 PERL_CALLCONV void	Perl_sys_intern_init(pTHX);
 #endif
 
-PERL_CALLCONV const char *	Perl_custom_op_name(pTHX_ const OP* op)
+PERL_CALLCONV const char *	Perl_custom_op_name(pTHX_ const OP *o)
 			__attribute__warn_unused_result__
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV const char *	Perl_custom_op_desc(pTHX_ const OP* op)
+PERL_CALLCONV const char *	Perl_custom_op_desc(pTHX_ const OP *o)
 			__attribute__warn_unused_result__
 			__attribute__nonnull__(pTHX_1);
 
@@ -3021,7 +3021,7 @@ STATIC void	S_hv_magic_check(HV *hv, bool *needs_copy, bool *needs_store)
 			__attribute__nonnull__(3);
 
 STATIC void	S_unshare_hek_or_pvn(pTHX_ const HEK* hek, const char* str, I32 len, U32 hash);
-STATIC HEK*	S_share_hek_flags(pTHX_ const char* sv, I32 len, U32 hash, int flags)
+STATIC HEK*	S_share_hek_flags(pTHX_ const char *str, I32 len, U32 hash, int flags)
 			__attribute__warn_unused_result__
 			__attribute__nonnull__(pTHX_1);
 
@@ -3033,8 +3033,8 @@ STATIC void	S_hv_notallowed(pTHX_ int flags, const char *key, I32 klen, const ch
 STATIC struct xpvhv_aux*	S_hv_auxinit(HV *hv)
 			__attribute__nonnull__(1);
 
-STATIC SV*	S_hv_delete_common(pTHX_ HV* tb, SV* keysv, const char* key, STRLEN klen, int k_flags, I32 d_flags, U32 hash);
-STATIC void	S_clear_placeholders(pTHX_ HV* hb, U32 items)
+STATIC SV*	S_hv_delete_common(pTHX_ HV *hv, SV *keysv, const char *key, STRLEN klen, int k_flags, I32 d_flags, U32 hash);
+STATIC void	S_clear_placeholders(pTHX_ HV *hv, U32 items)
 			__attribute__nonnull__(pTHX_1);
 
 STATIC SV *	S_refcounted_he_value(pTHX_ const struct refcounted_he *he)
@@ -3455,11 +3455,11 @@ STATIC int	S_div128(pTHX_ SV *pnum, bool *done)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2);
 
-STATIC const char *	S_group_end(pTHX_ const char *pat, const char *patend, char ender)
+STATIC const char *	S_group_end(pTHX_ const char *patptr, const char *patend, char ender)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2);
 
-STATIC const char *	S_get_num(pTHX_ const char *ppat, I32 *lenptr)
+STATIC const char *	S_get_num(pTHX_ const char *patptr, I32 *lenptr)
 			__attribute__warn_unused_result__
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2);
@@ -3587,11 +3587,11 @@ STATIC I32	S_amagic_i_ncmp(pTHX_ SV *a, SV *b)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2);
 
-STATIC I32	S_amagic_cmp(pTHX_ SV *a, SV *b)
+STATIC I32	S_amagic_cmp(pTHX_ SV *str1, SV *str2)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2);
 
-STATIC I32	S_amagic_cmp_locale(pTHX_ SV *a, SV *b)
+STATIC I32	S_amagic_cmp_locale(pTHX_ SV *str1, SV *str2)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2);
 
@@ -3631,79 +3631,79 @@ STATIC SV *	S_space_join_names_mortal(pTHX_ char *const *array)
 #endif
 
 #if defined(PERL_IN_REGCOMP_C) || defined(PERL_DECL_PROT)
-STATIC regnode*	S_reg(pTHX_ struct RExC_state_t *state, I32 paren, I32 *flagp, U32 depth)
+STATIC regnode*	S_reg(pTHX_ struct RExC_state_t *pRExC_state, I32 paren, I32 *flagp, U32 depth)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_3);
 
-STATIC regnode*	S_reganode(pTHX_ struct RExC_state_t *state, U8 op, U32 arg)
+STATIC regnode*	S_reganode(pTHX_ struct RExC_state_t *pRExC_state, U8 op, U32 arg)
 			__attribute__nonnull__(pTHX_1);
 
-STATIC regnode*	S_regatom(pTHX_ struct RExC_state_t *state, I32 *flagp, U32 depth)
+STATIC regnode*	S_regatom(pTHX_ struct RExC_state_t *pRExC_state, I32 *flagp, U32 depth)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2);
 
-STATIC regnode*	S_regbranch(pTHX_ struct RExC_state_t *state, I32 *flagp, I32 first, U32 depth)
+STATIC regnode*	S_regbranch(pTHX_ struct RExC_state_t *pRExC_state, I32 *flagp, I32 first, U32 depth)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2);
 
-STATIC STRLEN	S_reguni(pTHX_ const struct RExC_state_t *state, UV uv, char *s)
+STATIC STRLEN	S_reguni(pTHX_ const struct RExC_state_t *pRExC_state, UV uv, char *s)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_3);
 
-STATIC regnode*	S_regclass(pTHX_ struct RExC_state_t *state, U32 depth)
+STATIC regnode*	S_regclass(pTHX_ struct RExC_state_t *pRExC_state, U32 depth)
 			__attribute__nonnull__(pTHX_1);
 
 STATIC I32	S_regcurly(const char *s)
 			__attribute__warn_unused_result__
 			__attribute__nonnull__(1);
 
-STATIC regnode*	S_reg_node(pTHX_ struct RExC_state_t *state, U8 op)
+STATIC regnode*	S_reg_node(pTHX_ struct RExC_state_t *pRExC_state, U8 op)
 			__attribute__nonnull__(pTHX_1);
 
 STATIC UV	S_reg_recode(pTHX_ const char value, SV **encp)
 			__attribute__nonnull__(pTHX_2);
 
-STATIC regnode*	S_regpiece(pTHX_ struct RExC_state_t *state, I32 *flagp, U32 depth)
+STATIC regnode*	S_regpiece(pTHX_ struct RExC_state_t *pRExC_state, I32 *flagp, U32 depth)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2);
 
-STATIC regnode*	S_reg_namedseq(pTHX_ struct RExC_state_t *state, UV *valuep)
+STATIC regnode*	S_reg_namedseq(pTHX_ struct RExC_state_t *pRExC_state, UV *valuep)
 			__attribute__nonnull__(pTHX_1);
 
-STATIC void	S_reginsert(pTHX_ struct RExC_state_t *state, U8 op, regnode *opnd, U32 depth)
+STATIC void	S_reginsert(pTHX_ struct RExC_state_t *pRExC_state, U8 op, regnode *opnd, U32 depth)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_3);
 
-STATIC void	S_regtail(pTHX_ struct RExC_state_t *state, regnode *p, const regnode *val, U32 depth)
+STATIC void	S_regtail(pTHX_ struct RExC_state_t *pRExC_state, regnode *p, const regnode *val, U32 depth)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2)
 			__attribute__nonnull__(pTHX_3);
 
-STATIC SV *	S_reg_scan_name(pTHX_ struct RExC_state_t *state, U32 flags)
+STATIC SV *	S_reg_scan_name(pTHX_ struct RExC_state_t *pRExC_state, U32 flags)
 			__attribute__nonnull__(pTHX_1);
 
-STATIC U32	S_join_exact(pTHX_ struct RExC_state_t *state, regnode *scan, I32 *min, U32 flags, regnode *val, U32 depth)
+STATIC U32	S_join_exact(pTHX_ struct RExC_state_t *pRExC_state, regnode *scan, I32 *min, U32 flags, regnode *val, U32 depth)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2)
 			__attribute__nonnull__(pTHX_3);
 
-STATIC char *	S_regwhite(struct RExC_state_t *state, char *p)
+STATIC char *	S_regwhite(struct RExC_state_t *pRExC_state, char *p)
 			__attribute__warn_unused_result__
 			__attribute__nonnull__(1)
 			__attribute__nonnull__(2);
 
-STATIC char *	S_nextchar(pTHX_ struct RExC_state_t *state)
+STATIC char *	S_nextchar(pTHX_ struct RExC_state_t *pRExC_state)
 			__attribute__nonnull__(pTHX_1);
 
-STATIC bool	S_reg_skipcomment(pTHX_ struct RExC_state_t *state)
+STATIC bool	S_reg_skipcomment(pTHX_ struct RExC_state_t *pRExC_state)
 			__attribute__nonnull__(pTHX_1);
 
-STATIC void	S_scan_commit(pTHX_ const struct RExC_state_t* state, struct scan_data_t *data, I32 *minlenp, int is_inf)
+STATIC void	S_scan_commit(pTHX_ const struct RExC_state_t *pRExC_state, struct scan_data_t *data, I32 *minlenp, int is_inf)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2)
 			__attribute__nonnull__(pTHX_3);
 
-STATIC void	S_cl_anything(const struct RExC_state_t* state, struct regnode_charclass_class *cl)
+STATIC void	S_cl_anything(const struct RExC_state_t *pRExC_state, struct regnode_charclass_class *cl)
 			__attribute__nonnull__(1)
 			__attribute__nonnull__(2);
 
@@ -3711,11 +3711,11 @@ STATIC int	S_cl_is_anything(const struct regnode_charclass_class *cl)
 			__attribute__warn_unused_result__
 			__attribute__nonnull__(1);
 
-STATIC void	S_cl_init(const struct RExC_state_t* state, struct regnode_charclass_class *cl)
+STATIC void	S_cl_init(const struct RExC_state_t *pRExC_state, struct regnode_charclass_class *cl)
 			__attribute__nonnull__(1)
 			__attribute__nonnull__(2);
 
-STATIC void	S_cl_init_zero(const struct RExC_state_t* state, struct regnode_charclass_class *cl)
+STATIC void	S_cl_init_zero(const struct RExC_state_t *pRExC_state, struct regnode_charclass_class *cl)
 			__attribute__nonnull__(1)
 			__attribute__nonnull__(2);
 
@@ -3723,19 +3723,19 @@ STATIC void	S_cl_and(struct regnode_charclass_class *cl, const struct regnode_ch
 			__attribute__nonnull__(1)
 			__attribute__nonnull__(2);
 
-STATIC void	S_cl_or(const struct RExC_state_t* state, struct regnode_charclass_class *cl, const struct regnode_charclass_class *or_with)
+STATIC void	S_cl_or(const struct RExC_state_t *pRExC_state, struct regnode_charclass_class *cl, const struct regnode_charclass_class *or_with)
 			__attribute__nonnull__(1)
 			__attribute__nonnull__(2)
 			__attribute__nonnull__(3);
 
-STATIC I32	S_study_chunk(pTHX_ struct RExC_state_t* state, regnode **scanp, I32 *minlenp, I32 *deltap, regnode *last, struct scan_data_t *data, I32 stopparen, U8* recursed, struct regnode_charclass_class *and_withp, U32 flags, U32 depth)
+STATIC I32	S_study_chunk(pTHX_ struct RExC_state_t *pRExC_state, regnode **scanp, I32 *minlenp, I32 *deltap, regnode *last, struct scan_data_t *data, I32 stopparen, U8* recursed, struct regnode_charclass_class *and_withp, U32 flags, U32 depth)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2)
 			__attribute__nonnull__(pTHX_3)
 			__attribute__nonnull__(pTHX_4)
 			__attribute__nonnull__(pTHX_5);
 
-STATIC U32	S_add_data(struct RExC_state_t* state, U32 n, const char *s)
+STATIC U32	S_add_data(struct RExC_state_t *pRExC_state, U32 n, const char *s)
 			__attribute__warn_unused_result__
 			__attribute__nonnull__(1)
 			__attribute__nonnull__(3);
@@ -3745,20 +3745,20 @@ STATIC void	S_re_croak2(pTHX_ const char* pat1, const char* pat2, ...)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2);
 
-STATIC I32	S_regpposixcc(pTHX_ struct RExC_state_t* state, I32 value)
+STATIC I32	S_regpposixcc(pTHX_ struct RExC_state_t *pRExC_state, I32 value)
 			__attribute__nonnull__(pTHX_1);
 
-STATIC void	S_checkposixcc(pTHX_ struct RExC_state_t* state)
+STATIC void	S_checkposixcc(pTHX_ struct RExC_state_t *pRExC_state)
 			__attribute__nonnull__(pTHX_1);
 
-STATIC I32	S_make_trie(pTHX_ struct RExC_state_t* state, regnode *startbranch, regnode *first, regnode *last, regnode *tail, U32 word_count, U32 flags, U32 depth)
+STATIC I32	S_make_trie(pTHX_ struct RExC_state_t *pRExC_state, regnode *startbranch, regnode *first, regnode *last, regnode *tail, U32 word_count, U32 flags, U32 depth)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2)
 			__attribute__nonnull__(pTHX_3)
 			__attribute__nonnull__(pTHX_4)
 			__attribute__nonnull__(pTHX_5);
 
-STATIC void	S_make_trie_failtable(pTHX_ struct RExC_state_t* state, regnode *source, regnode *node, U32 depth)
+STATIC void	S_make_trie_failtable(pTHX_ struct RExC_state_t *pRExC_state, regnode *source, regnode *stclass, U32 depth)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2)
 			__attribute__nonnull__(pTHX_3);
@@ -3786,7 +3786,7 @@ STATIC void	S_dump_trie_interim_table(pTHX_ const struct _reg_trie_data *trie, H
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_3);
 
-STATIC U8	S_regtail_study(pTHX_ struct RExC_state_t *state, regnode *p, const regnode *val, U32 depth)
+STATIC U8	S_regtail_study(pTHX_ struct RExC_state_t *pRExC_state, regnode *p, const regnode *val, U32 depth)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2)
 			__attribute__nonnull__(pTHX_3);
@@ -3819,20 +3819,20 @@ STATIC CHECKPOINT	S_regcppush(pTHX_ I32 parenfloor);
 STATIC char*	S_regcppop(pTHX_ const regexp *rex)
 			__attribute__nonnull__(pTHX_1);
 
-STATIC U8*	S_reghop3(U8 *pos, I32 off, const U8 *lim)
+STATIC U8*	S_reghop3(U8 *s, I32 off, const U8 *lim)
 			__attribute__warn_unused_result__
 			__attribute__nonnull__(1)
 			__attribute__nonnull__(3);
 
 #ifdef XXX_dmq
-STATIC U8*	S_reghop4(U8 *pos, I32 off, const U8 *llim, const U8 *rlim)
+STATIC U8*	S_reghop4(U8 *s, I32 off, const U8 *llim, const U8 *rlim)
 			__attribute__warn_unused_result__
 			__attribute__nonnull__(1)
 			__attribute__nonnull__(3)
 			__attribute__nonnull__(4);
 
 #endif
-STATIC U8*	S_reghopmaybe3(U8 *pos, I32 off, const U8 *lim)
+STATIC U8*	S_reghopmaybe3(U8 *s, I32 off, const U8 *lim)
 			__attribute__warn_unused_result__
 			__attribute__nonnull__(1)
 			__attribute__nonnull__(3);
@@ -3853,7 +3853,7 @@ STATIC void	S_to_utf8_substr(pTHX_ regexp * prog)
 STATIC void	S_to_byte_substr(pTHX_ regexp * prog)
 			__attribute__nonnull__(pTHX_1);
 
-STATIC I32	S_reg_check_named_buff_matched(pTHX_ const regexp *rex, const regnode *prog)
+STATIC I32	S_reg_check_named_buff_matched(pTHX_ const regexp *rex, const regnode *scan)
 			__attribute__warn_unused_result__
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2);
@@ -3923,7 +3923,7 @@ STATIC void	S_not_a_number(pTHX_ SV *const sv)
 STATIC I32	S_visit(pTHX_ SVFUNC_t f, const U32 flags, const U32 mask)
 			__attribute__nonnull__(pTHX_1);
 
-STATIC void	S_sv_del_backref(pTHX_ SV *target, SV *ref)
+STATIC void	S_sv_del_backref(pTHX_ SV *tsv, SV *sv)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2);
 
@@ -4007,7 +4007,7 @@ STATIC PTR_TBL_ENT_t *	S_ptr_table_find(PTR_TBL_t *tbl, const void *sv)
 #if defined(PERL_IN_TOKE_C) || defined(PERL_DECL_PROT)
 STATIC void	S_check_uni(pTHX);
 STATIC void	S_force_next(pTHX_ I32 type);
-STATIC char*	S_force_version(pTHX_ char *start, int guessing)
+STATIC char*	S_force_version(pTHX_ char *s, int guessing)
 			__attribute__nonnull__(pTHX_1);
 
 STATIC char*	S_force_word(pTHX_ char *start, int token, int check_keyword, int allow_pack, int allow_tick)
@@ -4190,10 +4190,10 @@ STATIC SV*	S_swash_get(pTHX_ SV* swash, UV start, UV span)
 
 START_EXTERN_C
 
-PERL_CALLCONV void	Perl_sv_setsv_flags(pTHX_ SV* dsv, SV* ssv, I32 flags)
+PERL_CALLCONV void	Perl_sv_setsv_flags(pTHX_ SV *dstr, SV *sstr, I32 flags)
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV void	Perl_sv_catpvn_flags(pTHX_ SV* sv, const char* ptr, STRLEN len, I32 flags)
+PERL_CALLCONV void	Perl_sv_catpvn_flags(pTHX_ SV *dstr, const char *sstr, STRLEN len, I32 flags)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2);
 
@@ -4236,13 +4236,13 @@ PERL_CALLCONV void	Perl_PerlIO_clearerr(pTHX_ PerlIO *f);
 PERL_CALLCONV void	Perl_PerlIO_set_cnt(pTHX_ PerlIO *f, int cnt);
 PERL_CALLCONV void	Perl_PerlIO_set_ptrcnt(pTHX_ PerlIO *f, STDCHAR *ptr, int cnt);
 PERL_CALLCONV void	Perl_PerlIO_setlinebuf(pTHX_ PerlIO *f);
-PERL_CALLCONV SSize_t	Perl_PerlIO_read(pTHX_ PerlIO *f, void *buf, Size_t count)
+PERL_CALLCONV SSize_t	Perl_PerlIO_read(pTHX_ PerlIO *f, void *vbuf, Size_t count)
 			__attribute__nonnull__(pTHX_2);
 
-PERL_CALLCONV SSize_t	Perl_PerlIO_write(pTHX_ PerlIO *f, const void *buf, Size_t count)
+PERL_CALLCONV SSize_t	Perl_PerlIO_write(pTHX_ PerlIO *f, const void *vbuf, Size_t count)
 			__attribute__nonnull__(pTHX_2);
 
-PERL_CALLCONV SSize_t	Perl_PerlIO_unread(pTHX_ PerlIO *f, const void *buf, Size_t count)
+PERL_CALLCONV SSize_t	Perl_PerlIO_unread(pTHX_ PerlIO *f, const void *vbuf, Size_t count)
 			__attribute__nonnull__(pTHX_2);
 
 PERL_CALLCONV Off_t	Perl_PerlIO_tell(pTHX_ PerlIO *f);
@@ -4339,58 +4339,58 @@ PERL_CALLCONV int	Perl_get_debug_opts(pTHX_ const char **s, bool givehelp)
 			__attribute__nonnull__(pTHX_1);
 
 #endif
-PERL_CALLCONV void	Perl_save_set_svflags(pTHX_ SV* sv, U32 mask, U32 val)
+PERL_CALLCONV void	Perl_save_set_svflags(pTHX_ SV *sv, U32 mask, U32 val)
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV void	Perl_hv_assert(pTHX_ HV* tb)
+PERL_CALLCONV void	Perl_hv_assert(pTHX_ HV *hv)
 			__attribute__nonnull__(pTHX_1);
 
 
-PERL_CALLCONV SV*	Perl_hv_scalar(pTHX_ HV* hv)
+PERL_CALLCONV SV*	Perl_hv_scalar(pTHX_ HV *hv)
 			__attribute__warn_unused_result__
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV I32*	Perl_hv_riter_p(pTHX_ HV* hv)
+PERL_CALLCONV I32*	Perl_hv_riter_p(pTHX_ HV *hv)
 			__attribute__warn_unused_result__
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV HE**	Perl_hv_eiter_p(pTHX_ HV* hv)
+PERL_CALLCONV HE**	Perl_hv_eiter_p(pTHX_ HV *hv)
 			__attribute__warn_unused_result__
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV void	Perl_hv_riter_set(pTHX_ HV* hv, I32 riter)
+PERL_CALLCONV void	Perl_hv_riter_set(pTHX_ HV *hv, I32 riter)
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV void	Perl_hv_eiter_set(pTHX_ HV* hv, HE* eiter)
+PERL_CALLCONV void	Perl_hv_eiter_set(pTHX_ HV *hv, HE *eiter)
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV void	Perl_hv_name_set(pTHX_ HV* hv, const char *name, U32 len, U32 flags)
+PERL_CALLCONV void	Perl_hv_name_set(pTHX_ HV *hv, const char *name, U32 len, U32 flags)
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV AV**	Perl_hv_backreferences_p(pTHX_ HV* hv)
+PERL_CALLCONV AV**	Perl_hv_backreferences_p(pTHX_ HV *hv)
 			__attribute__nonnull__(pTHX_1);
 
 #if defined(PERL_IN_DUMP_C) || defined(PERL_IN_HV_C) || defined(PERL_IN_SV_C) || defined(PERL_DECL_PROT)
-PERL_CALLCONV void	Perl_hv_kill_backrefs(pTHX_ HV* hv)
+PERL_CALLCONV void	Perl_hv_kill_backrefs(pTHX_ HV *hv)
 			__attribute__nonnull__(pTHX_1);
 
 #endif
-PERL_CALLCONV void	Perl_hv_clear_placeholders(pTHX_ HV* hb)
+PERL_CALLCONV void	Perl_hv_clear_placeholders(pTHX_ HV *hv)
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV I32*	Perl_hv_placeholders_p(pTHX_ HV* hv)
+PERL_CALLCONV I32*	Perl_hv_placeholders_p(pTHX_ HV *hv)
 			__attribute__warn_unused_result__
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV I32	Perl_hv_placeholders_get(pTHX_ HV* hv)
+PERL_CALLCONV I32	Perl_hv_placeholders_get(pTHX_ HV *hv)
 			__attribute__warn_unused_result__
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV void	Perl_hv_placeholders_set(pTHX_ HV* hv, I32 ph)
+PERL_CALLCONV void	Perl_hv_placeholders_set(pTHX_ HV *hv, I32 ph)
 			__attribute__nonnull__(pTHX_1);
 
 
-PERL_CALLCONV SV*	Perl_magic_scalarpack(pTHX_ HV* hv, MAGIC* mg)
+PERL_CALLCONV SV*	Perl_magic_scalarpack(pTHX_ HV *hv, MAGIC *mg)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2);
 
@@ -4619,10 +4619,10 @@ PERL_CALLCONV void	Perl_op_xmldump(pTHX_ const OP* arg)
 
 
 PERL_CALLCONV TOKEN*	Perl_newTOKEN(pTHX_ I32 optype, YYSTYPE lval, MADPROP* madprop);
-PERL_CALLCONV void	Perl_token_free(pTHX_ TOKEN* arg)
+PERL_CALLCONV void	Perl_token_free(pTHX_ TOKEN *tk)
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV void	Perl_token_getmad(pTHX_ TOKEN* arg, OP* o, char slot)
+PERL_CALLCONV void	Perl_token_getmad(pTHX_ TOKEN *tk, OP *o, char slot)
 			__attribute__nonnull__(pTHX_1);
 
 PERL_CALLCONV void	Perl_op_getmad_weak(pTHX_ OP* from, OP* o, char slot);