diff --git a/lib/Analysis/AliasAnalysisEvaluator.cpp b/lib/Analysis/AliasAnalysisEvaluator.cpp
index df1a9b84f21..19d44dd9c85 100644
--- a/lib/Analysis/AliasAnalysisEvaluator.cpp
+++ b/lib/Analysis/AliasAnalysisEvaluator.cpp
@@ -91,10 +91,8 @@ bool AAEval::runOnFunction(Function &F) {
   }
 
   for (inst_iterator I = inst_begin(F), E = inst_end(F); I != E; ++I) {
-    if (CallInst *CI = dyn_cast<CallInst>(*I))
-      CallSites.insert(CallSite(CI));
-    else if (InvokeInst *II = dyn_cast<InvokeInst>(*I)) 
-      CallSites.insert(CallSite(II));
+    CallSite CS = CallSite::get(*I);
+    if (CS.getInstruction()) CallSites.insert(CS);
   }
 
   if (PrintNoAlias || PrintMayAlias || PrintMustAlias ||