Refactor to allow both tap and drag gesture recognizers.