Remove braces around single-statement block and rangify outer loop.

This is a follow-up to r213474.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@213475 91177308-0d34-0410-b5e6-96231b3b80d8