A bit more range construction cleanup