Lint cleanup

[bboreham]

See individual commits for details.

Should be no change in behaviour, just replacing some deprecated or questionable code.

This does not address every warning from golangci-lint, but it's a step forward.