Add lower and upper Orderings for Range
Fix NULL token bug

Not sure how this escaped notice for so long, since it's been there from
the beginning.