Update for latest Swift changes