Rework expression visitor.