Some minor refactoring for iOS: - Roll back clar changes; these should be a bit more measured, and occur in clar upstream. - Move iOS to nightly builds