And do some related cleanup
Pull request: https://github.com/WebKit/WebKit/pull/7345
Committed 257598@main (6fe0ea88b0e9): <https://commits.webkit.org/257598@main> Reviewed commits have been landed. Closing PR #7345 and removing active labels.
<rdar://problem/103157842>