Upgrade to subexpressions