more cleanups on RefinementVisitor