issue #21836: More fixes.