I was forced to do this as part of something else but don't want to clutter. Splitting out.
Created attachment 242057 [details] Patch
Created attachment 242058 [details] Patch
Committed r176465: <http://trac.webkit.org/changeset/176465>