in special cases - re-gofmt'ing of some files that are now improved R=r, rsc http://go/go-review/1023003
