We don't need a special case for numbers (as opposed to ranges) anymore, as everything is a range now.