Tidy up some go vet warnings.