diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFCallGraph.java b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFCallGraph.java
index 49401477d..87722a761 100644
--- a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFCallGraph.java
+++ b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFCallGraph.java
@@ -198,15 +198,9 @@ public class PDFCallGraph {
   private static class ApplicationLoaderFilter extends Predicate<CGNode> {
 
     @Override public boolean test(CGNode o) {
-      if (o instanceof CGNode) {
-        CGNode n = (CGNode) o;
-        return n.getMethod().getDeclaringClass().getClassLoader().getReference().equals(ClassLoaderReference.Application);
-      } else if (o instanceof LocalPointerKey) {
-        LocalPointerKey l = (LocalPointerKey) o;
-        return test(l.getNode());
-      } else {
+      if (o == null)
         return false;
-      }
+      return o.getMethod().getDeclaringClass().getClassLoader().getReference().equals(ClassLoaderReference.Application);
     }
   }
 }
diff --git a/com.ibm.wala.util/src/com/ibm/wala/fixedpoint/impl/DefaultFixedPointSystem.java b/com.ibm.wala.util/src/com/ibm/wala/fixedpoint/impl/DefaultFixedPointSystem.java
index 52c2139fd..e9978e299 100644
--- a/com.ibm.wala.util/src/com/ibm/wala/fixedpoint/impl/DefaultFixedPointSystem.java
+++ b/com.ibm.wala.util/src/com/ibm/wala/fixedpoint/impl/DefaultFixedPointSystem.java
@@ -261,7 +261,7 @@ public class DefaultFixedPointSystem<T extends IVariable<?>> implements IFixedPo
   public Iterator<T> getVariables() {
     return new FilterIterator<>(graph.iterator(), new Predicate<T>() {
       @Override public boolean test(T x) {
-        return x instanceof IVariable;
+        return x != null;
       }
     });
   }