more static inlining (missed on the previous commit)