Faster leaf node search CR-IU-897

(cherry picked from commit 94728b736ce6df2dbae6c827fd320569a658e14b)
Reduce Injection-related passes overhead, esp. for big files with not much injections CR-IU-894

(cherry picked from commit b2d8421c93a5f61f1be3b53b42aaf4aaa487ca87)