Incorporate @s0meone's fix for duplicate tap events

I meant to do this originally, but failed to notice his work was on
a different branch.