Fix #36127
gopls modernize
Recent modernize fixes: https://github.com/golang/tools/commits/master/gopls/internal/analysis/modernize