Now using PartialTermVisitor