babl: HEAD fixes

Part 1 of Closing #33582.