A much smaller manual set of changes in https://github.com/osquery/osquery/pull/6590/files

I left some comments

Bad copy paste. Exactly why I wrote tooling for most. Will fix after dinner.