swift

Fix a couple of issues with the fixit for unused `if let` bindings.

#1963

Merged