Improve diff handling, mostly washing of diffstats