Patch forthcoming.
Created attachment 224526 [details] work in progress
Created attachment 224554 [details] the patch
Landed in http://trac.webkit.org/changeset/164326