Shorten clumsy and repetitive gesture strings

Change-Id: I77e4d980bcb2f2ed64169450e2de225d9ab3c079