Don't use lexer to scan integers, percentages, or timestamps

The collect_timestamp code needs to be made slightly more complicated, unfortunately. However short of this, the integer/percentage tokens are not being used anymore because of #408 -- These should be removed to simplify code.