Also moved the range from the function's call sites to the functions return value as that is possible now.