Merge "Make 597-deopt-invoke-stub more solid."