Merge PartialInliner changes.