After some Xcode rejigging