issue #19453: Lots more fixes.