Lots of progress on DisjointRange and DisjointDiscreteRange and regtests for said.