Make go vet happy again