Handle fallout from the recent branch-on-undef changes. This fixes