[ConstantRange] improve my previous patch per Nick suggestion