Update for beta 6 swift changes.