Changing optional dependencies.
Reorganizing context-related components, tweaking tests, fixing SpEL access for internal, private fields with no getters.