Piecemeal adoption of Swift 6 improvements in Swift 5.x

[hborla (Holly Borla)]

I've kicked this off for review here. Thanks all for the discussion so far, and please take any further feedback over to the review thread!