Reduce diff with upstream.