Reorder a few rules; add explicit (x)digit rules