Add some of the gofmt flags back.

But still not cpuprofile, simplify, or rewrite.