Though glancing through the files touched in this PR, this is a reasonably large number of changes so not worth it currently.