Adapt to Swift 1.13.1

This reflects the recent changes in the swift codebase.