Cleanup and more reestructuring on iOS.