Manually refactored cases the refactoring to Modern Objective-C was complaining about