Xcode: apply suggested changes from Xcode 10.3