Mask mode: Drop redundant code, fix max_add_len for truncated
hybrid masks.