Update for post Beta 2 Swift.