The changed lines are mostly switching this function from 3-space to 4-space indentation. I don't like mixing whitespace changes with functional changes (and would prefer 3 spaces for the sake of consistency)