<rdar://problem/35492517>
Created attachment 326802 [details] proposed patch.
Created attachment 326804 [details] proposed patch.
Thanks for the review. Landed in r224784: <http://trac.webkit.org/r224784>.