diff --git a/Driver/RewriteObjC.cpp b/Driver/RewriteObjC.cpp
index 641da18..56f3b3d 100644
--- a/Driver/RewriteObjC.cpp
+++ b/Driver/RewriteObjC.cpp
@@ -1992,10 +1992,9 @@
   FunctionDecl *MsgSendStretFlavor = 0;
   if (ObjCMethodDecl *mDecl = Exp->getMethodDecl()) {
     QualType resultType = mDecl->getResultType();
-    if (resultType.getCanonicalType()->isStructureType() 
-        || resultType.getCanonicalType()->isUnionType())
+    if (resultType->isStructureType() || resultType->isUnionType())
       MsgSendStretFlavor = MsgSendStretFunctionDecl;
-    else if (resultType.getCanonicalType()->isRealFloatingType())
+    else if (resultType->isRealFloatingType())
       MsgSendFlavor = MsgSendFpretFunctionDecl;
   }
   
diff --git a/lib/Analysis/CFRefCount.cpp b/lib/Analysis/CFRefCount.cpp
index 17ad448..319318f 100644
--- a/lib/Analysis/CFRefCount.cpp
+++ b/lib/Analysis/CFRefCount.cpp
@@ -1462,8 +1462,7 @@
   QualType RetTy = RetE->getType();
 
   // FIXME: We aren't handling id<...>.
-  const PointerType* PT = RetTy.getCanonicalType()->getAsPointerType();
-  
+  const PointerType* PT = RetTy->getAsPointerType();
   if (!PT)
     return RetTy;