Attempt to fix XCode build issues reported by nrezmerski.