Here and below there appear to be a few unnecessary formatting changes (indentation mostly), which clutter the diffs.