I left the two I didn't introduce in https://trac.webkit.org/changeset/127837 for another patch.
Created attachment 162697 [details] patch
https://trac.webkit.org/changeset/127840