iOS: A few code modernizations