Objective-C. Changes per A. Ballman's comment
for my last patch. // rdar://17631257