Reduce diffs with upstream.