integrate tweaks suggested by @mikemcquaid in #26692