Slightly more robust handling of dependent_axes