Might be more robust to *always* use the mask's shape. (And below)