fix up parameter references after splitting out of get_pass_entry