Improve non-padded strict tokens

This is to fix #1401

Basically:
* Non padded tokens match greedily (`H` matches one or two)
* Padded tokens match exactly (`HH` is two digits)