Sure. That works equally well, and moves some of the responsibility for portability upstream. (Honestly, I didn't know you could do that.) I'm going to cancel this pull request and generate a clean one without the "infra" commit in it.