*: assorted minor issues identified by go vet
Merge pull request #838 from jonboulle/vet

*: assorted minor issues identified by go vet