BENTO-30. Reduces the number of compile scope dependencies.

Reviewed by: kiyan