golangci-lint has found several real issues and a number of minor ones. I split them into small patches to make the review easier.
dizzyfool
