Merge pull request #1950 from Hixie/gesture-cleanup

Gesture class hierarchy tune-up