after-BARF fixups, 18066