The nice collaborative discussion here so close to the code may actually be the best way to do it, even if the PR is stillborn and never gets merged.