more golint fixups