Updates and simplifications to the way in which ranges_eval is
calculated.