More changes required for Xcode 5 DP4.