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

This is a follow-up to r213474.