@mdboom - yes, like that. Maybe a bit complicated for `MaskedArray`, but should be do-able. And then of course we can check for the lower version of numpy that we still support whether a given fix is still required.