Thoughts on this?  Is it fine to merge as a single commit?

-- 
Pierre Neidhardt
https://ambrevar.xyz/