I'll do it after bug 134142 lands to avoid conflicts.
Created attachment 235534 [details] Patch
Comment on attachment 235534 [details] Patch Unleash the refactoring hounds!
Fixed in http://trac.webkit.org/changeset/171606