Just a few style (go vet, golint) and usage fixes.

—