Improve linter setup for this repo

[junedev]

Someone reported an error that could have been caught by staticcheck (#2023). We should investigate whether we can improve the linter setup for this repo so such errors are caught by the CI before the code is merged.