Fix some very simple, low hanging fruit issues
that semgrep is finding in the indexer.

There are some more issues, but they have a larger
scope.
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>