Refine diagnostics in my last patch.
// rdar://14303083