Shorten clumsy and repetitive gesture strings

Change-Id: Ia6bfb92bc3837a773a790e14079ee80c27a7039b