Use ENABLE() and USE() macros in a few more places
Created attachment 145615 [details] Patch
Committed r119417: <http://trac.webkit.org/changeset/119417>