I've rebased and squashed to make things manageable: https://stash.sd.apple.com/users/dabrahams/repos/swift/pull-requests/1/commits
HTH,
-- -Dave
