I have been bisecting.  It's really fun that there's hundreds, maybe around a
thousand, of bisection commits that won't compile.  See 4eaf317a, which
explains commits between 39b4cbad and itself are broken.

Cherry picking 4eaf317a has applied cleanly to the next 2 bisections.  Now at
560 revisions, 9 steps.