issue #22067: clean up diffs