Time to clean it up! :-)
Created attachment 130109 [details] Patch
Created attachment 130110 [details] Patch
Committed r109738: <http://trac.webkit.org/changeset/109738>