Objective-C. Minor refactoring of my last patch.
// rdar://16808765