Revert "Simplify inliningContext given our new contracts for shadowing"

This reverts commit 158e181831aa5b1aadb42e2893f4c2ef901d7692.