Address review comments to #1650#1665

ahoppen merged 3 commits intoswiftlang:mainswiftlang/swift-syntax:mainfrom

ahoppen:ahoppen/rintaro-review-commentsahoppen/swift-syntax:ahoppen/rintaro-review-commentsCopy head branch name to clipboard