we're going to need to get beyond bikeshed feedback if you want me to help continue spending unpleasant hours "taking out the trash"

If you feel strongly about things like this, open your own pull request and do it carte blanche as me opening another pull request for this just adds to the countless hours I wasted over things like this the last several days.