modset visitor
simplified modset visitor
partially fixed global assume scope problem