Issue #22393: More fixes to format