This PR polishes a bit.

Comment From: sbrannen

This has been merged into main in 8931b75b958144b1496da1b163553acd03e11ebd and partially revised in a related commit (8931b75b958144b1496da1b163553acd03e11ebd).

Thanks