Minor "go tool vet" cleanups