Apply suggestions from code review
Apply suggestions from code review

Co-Authored-By: Max Schaefer <7eec3cf5b89b1d86e86c91c467566a2fc8a0c3f4@users.noreply.github.com>
github/codeql,github/codeql,github/codeql,github/codeql-go,github/codeql,github/codeql-go,github/codeql,github/codeql,github/codeql,github/codeql,github/codeql,github/codeql-go,github/codeql,github/codeql,github/codeql-go,github/codeql,github/codeql,github/codeql,github/codeql