Turn token range queries into bare tokens

This is better then just eating > and < in all cases because that
can build empty queries unintentionally.

Change-Id: Idbb5742c42b8b7106507761fefb1613f196eb2bd
Merge "Turn token range queries into bare tokens"