timezone: improve grammar parsing