Another follow-up cleanup to take after the remaining patches of phase 1 are merged.
Created attachment 282049 [details] Patch
Created attachment 282517 [details] Patch
Committed r202727: <http://trac.webkit.org/changeset/202727>