Fixes from go fmt and go vet.