Until we start running a formatter like uncrustify try to keep formatting changes out of the updates, especially non-significant whitespace changes. They make the diff larger than they need be.