Trivial tweaks from gofmt and goimports