Make compatibility changes for Xcode 6.1 GM.