Make subexpressions play nice with context