Mask mode: Fix bugs for using default mask (bare --mask option).