More un-inlining.