Begin changes for range parsing.