Split away the optional case.
Created attachment 448067 [details] Patch
Created attachment 448069 [details] Patch
Committed r287479 (245614@main): <https://commits.webkit.org/245614@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 448069 [details].
<rdar://problem/86985024>