Convert items that Xcode's refactoring missed to modern Objective-C