Merge branch 'codex/linter-fixes-1' - gocritic fixes part 1