Not sure if you have a preference here, but with the extra levels of nesting, I'm thinking we should go to 2 spaces indention, as this seems to be pretty standard anyway (and the diff is going to be hard to read anyway)