improved hasCallVisitor