Merge branch 'cb/builtin-merge-format-string-fix' into maint

Code clean-up. * cb/builtin-merge-format-string-fix: builtin/merge: avoid -Wformat-extra-args from ancient Xcode