Swift updates

Remove patches that are merged upstream and update others.