"go vet" cleanup, fixes #30