This will simplify things a lot.
Created attachment 264659 [details]
it's a start
Created attachment 264700 [details]
Of course it doesn't compile yet.
Created attachment 264703 [details]
Attachment 264703 [details] did not pass style-queue:
Total errors found: 2 in 39 files
If any of these errors are false positives, please file a bug against check-webkit-style.
Comment on attachment 264703 [details]
Landed in http://trac.webkit.org/changeset/191993