gofmt cleanups.