Changes required for Swift interoperability