Update with the latest changes for Xcode.