Fix corner cases with UDA and Lustre shuffling.