Cleanups according to golint.