diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp
index a582540..d5d83be 100644
--- a/lib/Sema/SemaDeclCXX.cpp
+++ b/lib/Sema/SemaDeclCXX.cpp
@@ -1202,12 +1202,7 @@
     Diag(D.getIdentifierLoc(), diag::err_destructor_with_params);
 
     // Delete the parameters.
-    DeclaratorChunk::FunctionTypeInfo &FTI = D.getTypeObject(0).Fun;
-    if (FTI.NumArgs) {
-      delete [] FTI.ArgInfo;
-      FTI.NumArgs = 0;
-      FTI.ArgInfo = 0;
-    }
+    D.getTypeObject(0).Fun.freeArgs();
   }
 
   // Make sure the destructor isn't variadic.  
@@ -1264,12 +1259,7 @@
     Diag(D.getIdentifierLoc(), diag::err_conv_function_with_params);
 
     // Delete the parameters.
-    DeclaratorChunk::FunctionTypeInfo &FTI = D.getTypeObject(0).Fun;
-    if (FTI.NumArgs) {
-      delete [] FTI.ArgInfo;
-      FTI.NumArgs = 0;
-      FTI.ArgInfo = 0;
-    }
+    D.getTypeObject(0).Fun.freeArgs();
   }
 
   // Make sure the conversion function isn't variadic.