R1:461f608b5c3f

Fix diff-of-diffs to respect the right-hand-side diff.