Convert more to el.tap() after bug landed
Merge pull request #890 from bobsilverberg/convert_more_tap

Convert more to el.tap() after bug landed