Clean up and generalize some interaction additions
Created attachment 386045 [details] Patch
https://trac.webkit.org/changeset/253850/webkit
<rdar://problem/58127222>