Fix some golint issues.