issue #19453: More progress.