This PR polishes a bit.

See gh-23846 See gh-29955

Comment From: sbrannen

This has been merged into main.

Thanks