Convert more to el.tap() after bug landed

The resolution of https://bugzilla.mozilla.org/show_bug.cgi?id=857582 fixes some of our issues with el.tap(), but not all of them. I have been able to convert a few more calls and those are contained in this pull request.