Merge "Fix deprecated range_x() calls."