I was considering nicer indenting against cluttering the current diff and future 'blame's. I've decided to go with as little changes as possible. I'd be nice to have this covered in the coding style guide #1485 so that we know what to go for.