More inlining.  (#5).