Better context inlining