Hybrid Mask: Fix detection of missing ?w when mask was not
truncated. See #837.