Simplify context sharing after removing bnode renaming from expansion.