Bah--totally my fault. I branched from *my* master which was circa February and not up-to-date. I'll redo my patch against the current master.