Adjust automatic Xcode 5 housekeeping changes

travis.ci is not running the latest toolchain yet, so let's maintain
backwards compatibility with Xcode 4.6 for now.