The preceding commit is Jeff's change minus the hunks at 160 (dead
code) and 422 (remove style nit patch to minimize change).