Clean up dictionary handling a little
Created attachment 219096 [details] Patch
Committed r160504: <http://trac.webkit.org/changeset/160504>