Re: rlm_pap code tidy