Fix a few style issues pointed out by golint.