Inlining more stuff