Adapted to the intervals no longer being generic.