All good to merge, thanks.

(In reviewing the final commit I did notice there is a format-string issue in the deprecation messaging which imagine was missed from a recent PR touching the deprecation module, but I will blitz a commit to fix that separately:
DeprecationError: Data attribute 'isscalar' has been deprecated at version TODODASK and will be removed at version and will be removed at version 5.0.0. Use 'd.ndim == 0' instead)