Minor golint cleanups