Refactor of ExprSets.