Some miscellaneous cleanup en route to fixing rdar://96074318.
Pull request: https://github.com/WebKit/WebKit/pull/1899
Committed 251960@main (1941a4dbfa8e): <https://commits.webkit.org/251960@main> Reviewed commits have been landed. Closing PR #1899 and removing active labels.