I think I actually prefer the original explicit logic. But much more importantly, this is not a reliable use of the fill value!