Address review comments to #1306#1309

ahoppen merged 2 commits intoswiftlang:mainswiftlang/sourcekit-lsp:mainfrom

ahoppen:review-comments-1306ahoppen/sourcekit-lsp:review-comments-1306Copy head branch name to clipboard