Update for Swift changes in beta 5.