Issue #22393: More formatting fixes