Minor "go tool vet" cleanups
Merge pull request #290 from prometheus/fix/go-vet

Minor "go tool vet" cleanups