More pre-reg Bootstrap conversion