Migrate to modern Objective-C syntax;