More strict RangeElement matching.

Only matches valid constants.
Cleanup (spacing)