Pacify 'go vet' a bit

We can't pacify it completely because we do something it doesn't approve
of.