Level 2 of the new optimizer (inlining), bug fix