Okay. I added the remainder to flagged https://github.com/osquery/osquery/pull/6692 as ready to review.