Objective-C. Minor refactoring of my previous patch.
rdar://17554063