move more to modern objc syntax.