Raider sub entity predicate cannot test for one of has_raid and is_captain

The new raider entity sub predicate has two optional fields has_raid and is_captain. However unlike other (sub) predicates, these fields are of type boolean and default to false, instead of having type Optional<Boolean>.

Consider the following predicate:

{
  "condition": "minecraft:entity_properties",
  "entity": "this",
  "predicate": {
    "type_specific": {
      "type": "minecraft:raider",
      "has_raid": true
    }
  }
}

Expected behavior:
The predicate tests that the raider is part of a raid, whether it is a captain or not

Actual behavior:
The predicate tests that the raider is part of a raid AND is not a captain.