Bug 1032869 - Part 2 addendum: Deal with inliners more simply.