Even more range construction cleanup