This PR polishes a bit.

Comment From: sbrannen

This has been merged into main in 2b750926c36496f6f478a5e4b3ff13cec63ef8ba and revised in 574c57739e993cd539d3cac7feace16d94da1f7f.

Thanks