Um, what happened to the indentation here? It's still a `for() { if() { } }`, right?

...probably want to put curly braces on that for() block, it's looking really wrong otherwise anyway. For a merge, I'd just omit this part of the diff.