diff --git a/lib/Sema/SemaOverload.cpp b/lib/Sema/SemaOverload.cpp
index 98a32ef..dbd2126 100644
--- a/lib/Sema/SemaOverload.cpp
+++ b/lib/Sema/SemaOverload.cpp
@@ -1479,9 +1479,9 @@
     = TryObjectArgumentInitialization(From, Method);
   if (ICS.ConversionKind == ImplicitConversionSequence::BadConversion)
     return Diag(From->getSourceRange().getBegin(),
-                diag::err_implicit_object_parameter_init,
-                ImplicitParamType.getAsString(), From->getType().getAsString(),
-                From->getSourceRange());
+                diag::err_implicit_object_parameter_init)
+       << ImplicitParamType.getAsString() << From->getType().getAsString()
+       << From->getSourceRange();
 
   if (ICS.Standard.Second == ICK_Derived_To_Base &&
       CheckDerivedToBaseConversion(From->getType(), ImplicitParamType,
@@ -2597,8 +2597,8 @@
                                     Cand->Conversions.size(),
                                     false, 0);
 
-        Diag(SourceLocation(), diag::err_ovl_builtin_candidate,
-             FnType.getAsString());
+        Diag(SourceLocation(), diag::err_ovl_builtin_candidate)
+          << FnType.getAsString();
       }
     }
   }