Make some changes suggested by golint.