Pass the marketplace semgrep check

Clears 9 blocking semgrep findings for the develop release, using the same changes as the version-3 fix.