KER-291: Speed up access to components with scope
KER-291: Code cleanup