Expanded detection of ranges. Must add match-arm variable support.