It looks like this file was reformatted with 4-space tabs. Was that intentional? It is causing a lot of spurious diffs.