Encapsulate a bit
Created attachment 215497 [details] patch
Comment on attachment 215497 [details] patch Looks sane
https://trac.webkit.org/r158268