Shot at fix for resolving sub-chains in expressions. WIP