Merge "More robust 652-deopt-intrinsic."