Changes after update to Xcode 5.1 beta 4 (it’s much more fussy).