Address some minor things reported by golint.