Fix some golint and go vet issues.