block: Fix issues reported by golint (github.com/golang/lint/golint).