Python: Remove points-to from Expr

python/ql/src/Variables/UndefinedGlobal.ql

@@ -11,6 +11,7 @@
  */
 
 import python
+private import LegacyPointsTo
 import Variables.MonkeyPatched
 import Loop
 import semmle.python.pointsto.PointsTo
@@ -95,7 +96,7 @@ predicate undefined_use(Name u) {
   not contains_unknown_import_star(u.getEnclosingModule()) and
   not use_of_exec(u.getEnclosingModule()) and
   not exists(u.getVariable().getAStore()) and
-  not u.pointsTo(_) and
+  not u.(ExprWithPointsTo).pointsTo(_) and
   not probably_defined_in_loop(u)
 }
 

python/ql/src/Variables/UninitializedLocal.ql

@@ -12,6 +12,7 @@
  */
 
 import python
+private import LegacyPointsTo
 import Undefined
 import semmle.python.pointsto.PointsTo
 
@@ -30,7 +31,7 @@ predicate uninitialized_local(NameNode use) {
 predicate explicitly_guarded(NameNode u) {
   exists(Try t |
     t.getBody().contains(u.getNode()) and
-    t.getAHandler().getType().pointsTo(ClassValue::nameError())
+    t.getAHandler().getType().(ExprWithPointsTo).pointsTo(ClassValue::nameError())
   )
 }