Fixed some additional golint issues.