Apply xcode fixes from Jan Weiß, except one chunk that seems mistaken.
1 file changed