Improved set visitor.