If you don't mind, it would be helpful if wherever `go fmt` changes a dozen lines as a result of us adding a longer variable name to the block we could instead separate (add a newline) between the old and new variables.  It would help clarify what changes this pull request is actually making.

It's present in a few places but I'm just commenting here.