grammar: clear up issues with leading 0's in token definitions