Fairly big change in logic. Does the `oz_ndim == 0` case matter any more?