Fix minor style issues pointed out by golint.