Merge "Cleanup polymorphic inlining to the same target."