Could you try to somehow avoid those whitespace changes? This blows up the diff and makes it much harder to parse