Minimizing differences with upstream.