Minor golint cleanups.