*: fix a few small issues identified by go vet
Merge pull request #1030 from jonboulle/assorted

*: fix a few small issues identified by go vet