Misc refactoring to modern Objective-C syntax