colregs 0.3.1 → 0.3.3

package/fixtures/situation-fixtures.json

@@ -1,5 +1,5 @@
 {
- "note": "Situations and the applicability entry ids that apply to each, under the International rules. The two-subject sibling of applicability-fixtures.json, which is untouched and stays the one-subject contract (REQ-VERIFY-1, REQ-CAT-5). A situation addresses each vessel's facts through the subject namespace of docs/identifiers.md: <subject>:<class>:<key>, subject in {own, other, pair}.",
+ "note": "Situations and the applicability entry ids that apply to each, under the International rules. The two-subject sibling of applicability-fixtures.json, which is untouched and stays the one-subject contract (REQ-VERIFY-1, REQ-CAT-5). A situation addresses each vessel's facts through the subject namespace of docs/identifiers.md: <subject>:<class>:<key>, subject in {self, other, pair}.",
  "schema": "situation/1",
  "status": "pencil",
  "adr": "0005",
@@ -15,7 +15,7 @@
   "bare": "rule:23a_i",
   "with_modality": {
    "entry": "rule:23a_ii",
-   "modality": "may"
+   "modality": "modality:may"
   }
  },
  "case_status": {
@@ -27,9 +27,9 @@
  },
  "cases": [
   {
-   "name": "crossing: own power-driven, other fine on the starboard bow",
+   "name": "crossing: self power-driven, other fine on the starboard bow",
    "status": "binding",
-   "narrative": "Two power-driven vessels in sight of one another, other bearing 040 relative at 3 nm on a steady bearing and crossing right to left ahead. Own has the other on her own starboard side, so own is the give-way vessel under Rule 15 and Rule 16 governs the action; the other is stand-on under Rule 17. Rule 15 is not transcribed yet, so this asserts nothing. Binding since Rules 7(d), 13, 14 and 15 landed: rule:15a:crossing is the encounter, rule:15a:keep_out_of_the_way is the role, rule:7d_i is the steady bearing, and rule:8f_iii is Rule 8(f)(iii) denying the stand-on vessel any privilege from a shall-not-impede duty she is not owed. Rules 16 and 17 are `conduct` and are still not modelled.",
+   "narrative": "Two power-driven vessels in sight of one another, other bearing 040 relative at 3 nm on a steady bearing and crossing right to left ahead. Self has the other on her own starboard side, so self is the give-way vessel under Rule 15 and Rule 16 governs the action; the other is stand-on under Rule 17. Rule 15 is not transcribed yet, so this asserts nothing. Binding since Rules 7(d), 13, 14 and 15 landed: rule:15a:crossing is the encounter, rule:15a:keep_out_of_the_way is the role, rule:7d_i is the steady bearing, and rule:8f_iii is Rule 8(f)(iii) denying the stand-on vessel any privilege from a shall-not-impede duty she is not owed. Rules 16 and 17 are `category:conduct` and are still not modelled.",
    "expect": [
     "rule:4",
     "rule:11",
@@ -39,7 +39,7 @@
     "rule:15a:keep_out_of_the_way"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:none",
@@ -49,7 +49,7 @@
      },
      "kin": {
       "kin:position": {
-       "latitude": 50.0,
+       "latitude": 50,
        "longitude": -1.4
       },
       "kin:heading_deg": 0,
@@ -94,19 +94,33 @@
     "pair": {
      "geo": {
       "geo:range_m": 5556,
-      "geo:bearing_change_deg_min": 0.0,
+      "geo:bearing_change_deg_min": 0,
       "geo:cpa_m": 1,
       "geo:tcpa_s": 1023,
       "geo:in_sight": true,
       "geo:risk_of_collision": true
      }
     }
+   },
+   "roles": {
+    "self": [
+     {
+      "role": "role:give-way",
+      "by": "rule:15a:keep_out_of_the_way"
+     }
+    ],
+    "other": [
+     {
+      "role": "role:stand-on",
+      "by": "rule:15a:keep_out_of_the_way"
+     }
+    ]
    }
   },
   {
    "name": "narrow channel: head-on round a bend, bank 100 m to starboard",
    "status": "binding",
-   "narrative": "The R1 illustration of ADR 0005 sec. 5 and the proposal's sec. 4. Own keeps to the starboard side of a narrow channel per Rule 9(a); a vessel cuts the bend and is head-on at 800 m. Rule 14(a) requires each to alter to starboard, and the bank is 100 m to starboard of own. Every compliant plan grounds or collides; a port alteration passes starboard-to-starboard and breaches 14(a). The value of the case here is not the region finding, which belongs to colregs-engine -- it is that the situation record can carry it at all. Binding now: `pair:env:narrow_channel` is the fact the recorded gap asked for and rule:14b is the classification. Neither 9(b) nor 9(c) applies from own's side -- she is 24 m and power-driven -- so the narrow channel changes no entry here and is stated because it is true, not to select one. Recast on a steady bearing when the consistency check landed (Q-48): the other now bears 357 relative, three degrees on own's port bow, and has own 3.6 degrees on her own starboard bow, which at 12 and 10 knots is a collision course. The 3/8 starboard-to-starboard pair the case opened with passed at 74 m with the bearing changing four and a half degrees a minute, and no positive speeds make it steady -- two vessels each with the other to starboard are never on a collision course. The dilemma is unchanged: a starboard alteration is into the bank.",
+   "narrative": "The R1 illustration of ADR 0005 sec. 5 and the proposal's sec. 4. Self keeps to the starboard side of a narrow channel per Rule 9(a); a vessel cuts the bend and is head-on at 800 m. Rule 14(a) requires each to alter to starboard, and the bank is 100 m to starboard of self. Every compliant plan grounds or collides; a port alteration passes starboard-to-starboard and breaches 14(a). The value of the case here is not the region finding, which belongs to colregs-engine -- it is that the situation record can carry it at all. Binding now: `pair:env:narrow_channel` is the fact the recorded gap asked for and rule:14b is the classification. Neither 9(b) nor 9(c) applies from self's side -- she is 24 m and power-driven -- so the narrow channel changes no entry here and is stated because it is true, not to select one. Recast on a steady bearing when the consistency check landed (Q-48): the other now bears 357 relative, three degrees on self's port bow, and has self 3.6 degrees on her own starboard bow, which at 12 and 10 knots is a collision course. The 3/8 starboard-to-starboard pair the case opened with passed at 74 m with the bearing changing four and a half degrees a minute, and no positive speeds make it steady -- two vessels each with the other to starboard are never on a collision course. The dilemma is unchanged: a starboard alteration is into the bank.",
    "expect": [
     "rule:4",
     "rule:11",
@@ -115,7 +129,7 @@
     "rule:14b"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:none",
@@ -125,7 +139,7 @@
      },
      "kin": {
       "kin:position": {
-       "latitude": 50.0,
+       "latitude": 50,
        "longitude": -1.4
       },
       "kin:heading_deg": 90,
@@ -134,7 +148,7 @@
       "kin:dynamics": "dynamics:ferry"
      },
      "geo": {
-      "geo:rel_bearing_deg": 357.0
+      "geo:rel_bearing_deg": 357
      },
      "hist": {
       "hist:was_overtaking": false,
@@ -170,7 +184,7 @@
     "pair": {
      "geo": {
       "geo:range_m": 800,
-      "geo:bearing_change_deg_min": 0.0,
+      "geo:bearing_change_deg_min": 0,
       "geo:cpa_m": 0,
       "geo:tcpa_s": 71,
       "geo:in_sight": true,
@@ -186,7 +200,7 @@
   {
    "name": "13(d) latch: an overtaking whose bearing has drawn out to a crossing",
    "status": "binding",
-   "narrative": "Own came up on the other vessel from abaft her beam and is overtaking. The bearing has since drawn out: own now bears 250 relative from the other, just outside Rule 13(b)'s 112.5-247.5 sector, so the instantaneous geometry alone would reclassify this as a crossing with the other vessel give-way. Rule 13(d) forbids exactly that, and own:hist:was_overtaking is the fact that carries it. This is the case that makes history a class rather than a note. Binding: rule:13d holds the classification at overtaking on the strength of the latch alone, and rule:15a:crossing is absent -- not because the geometry excludes it, which it does not, but because its `own:hist:was_overtaking: false` gate does. That absence is the whole content of 13(d). The pair numbers were re-derived from the kinematics when the consistency check landed (Q-48): at 400 m abeam with five knots between them the bearing is changing at 24 degrees a minute and the closest approach is already past, so 7(d)(i)'s steady-bearing ground is not available and `rule:7d_i` left the expectation. `geo:risk_of_collision` is a supplied judgement and stays true -- nothing in this package may deny a risk, and 13(d) does not read one.",
+   "narrative": "Self came up on the other vessel from abaft her beam and is overtaking. The bearing has since drawn out: self now bears 250 relative from the other, just outside Rule 13(b)'s 112.5-247.5 sector, so the instantaneous geometry alone would reclassify this as a crossing with the other vessel give-way. Rule 13(d) forbids exactly that, and self:hist:was_overtaking is the fact that carries it. This is the case that makes history a class rather than a note. Binding: rule:13d holds the classification at overtaking on the strength of the latch alone, and rule:15a:crossing is absent -- not because the geometry excludes it, which it does not, but because its `self:hist:was_overtaking: false` gate does. That absence is the whole content of 13(d). The pair numbers were re-derived from the kinematics when the consistency check landed (Q-48): at 400 m abeam with five knots between them the bearing is changing at 24 degrees a minute and the closest approach is already past, so 7(d)(i)'s steady-bearing ground is not available and `rule:7d_i` left the expectation. `geo:risk_of_collision` is a supplied judgement and stays true -- nothing in this package may deny a risk, and 13(d) does not read one.",
    "expect": [
     "rule:4",
     "rule:11",
@@ -195,7 +209,7 @@
     "rule:13d"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:none",
@@ -205,7 +219,7 @@
      },
      "kin": {
       "kin:position": {
-       "latitude": 50.0,
+       "latitude": 50,
        "longitude": -1.4
       },
       "kin:heading_deg": 20,
@@ -262,10 +276,10 @@
   {
    "name": "19(d)(i) fact reachability: an overtaking latch, out of sight",
    "status": "illustrative",
-   "narrative": "The `13(d)` latch case above with `pair:geo:in_sight` flipped to `false` and own's latch already set. No Rule 19 entry exists yet to read it, so `expect` is empty; the Q-49 test reads the fact directly.",
+   "narrative": "The `13(d)` latch case above with `pair:geo:in_sight` flipped to `false` and self's latch already set. No Rule 19 entry exists yet to read it, so `expect` is empty; the Q-49 test reads the fact directly.",
    "expect": [],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:none",
@@ -275,7 +289,7 @@
      },
      "kin": {
       "kin:position": {
-       "latitude": 50.0,
+       "latitude": 50,
        "longitude": -1.4
       },
       "kin:heading_deg": 20,
@@ -330,15 +344,15 @@
    }
   },
   {
-   "name": "18 matrix: own power-driven, other power-driven, in sight",
+   "name": "18 matrix: self power-driven, other power-driven, in sight",
    "status": "binding",
-   "narrative": "Own is power-driven; the other vessel is power-driven. Both underway and in sight of one another.",
+   "narrative": "Self is power-driven; the other vessel is power-driven. Both underway and in sight of one another.",
    "expect": [
     "rule:11",
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:none",
@@ -364,16 +378,16 @@
    }
   },
   {
-   "name": "18 matrix: own power-driven, other sailing, in sight",
+   "name": "18 matrix: self power-driven, other sailing, in sight",
    "status": "binding",
-   "narrative": "Own is power-driven; the other vessel is sailing. Both underway and in sight of one another.",
+   "narrative": "Self is power-driven; the other vessel is sailing. Both underway and in sight of one another.",
    "expect": [
     "rule:11",
     "rule:18a_iv",
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:none",
@@ -399,16 +413,16 @@
    }
   },
   {
-   "name": "18 matrix: own power-driven, other fishing (power), in sight",
+   "name": "18 matrix: self power-driven, other fishing (power), in sight",
    "status": "binding",
-   "narrative": "Own is power-driven; the other vessel is fishing (power). Both underway and in sight of one another.",
+   "narrative": "Self is power-driven; the other vessel is fishing (power). Both underway and in sight of one another.",
    "expect": [
     "rule:11",
     "rule:18a_iii",
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:none",
@@ -434,16 +448,16 @@
    }
   },
   {
-   "name": "18 matrix: own power-driven, other not under command, in sight",
+   "name": "18 matrix: self power-driven, other not under command, in sight",
    "status": "binding",
-   "narrative": "Own is power-driven; the other vessel is not under command. Both underway and in sight of one another.",
+   "narrative": "Self is power-driven; the other vessel is not under command. Both underway and in sight of one another.",
    "expect": [
     "rule:11",
     "rule:18a_i",
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:none",
@@ -469,16 +483,16 @@
    }
   },
   {
-   "name": "18 matrix: own power-driven, other restricted in her ability to manoeuvre, in sight",
+   "name": "18 matrix: self power-driven, other restricted in her ability to manoeuvre, in sight",
    "status": "binding",
-   "narrative": "Own is power-driven; the other vessel is restricted in her ability to manoeuvre. Both underway and in sight of one another.",
+   "narrative": "Self is power-driven; the other vessel is restricted in her ability to manoeuvre. Both underway and in sight of one another.",
    "expect": [
     "rule:11",
     "rule:18a_ii",
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:none",
@@ -504,19 +518,19 @@
    }
   },
   {
-   "name": "18 matrix: own power-driven, other constrained by her draught, in sight",
+   "name": "18 matrix: self power-driven, other constrained by her draught, in sight",
    "status": "binding",
-   "narrative": "Own is power-driven; the other vessel is constrained by her draught. Both underway and in sight of one another.",
+   "narrative": "Self is power-driven; the other vessel is constrained by her draught. Both underway and in sight of one another.",
    "expect": [
     "rule:11",
     {
      "entry": "rule:18d_i",
-     "modality": "shall-if-practicable"
+     "modality": "modality:shall-if-practicable"
     },
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:none",
@@ -542,15 +556,15 @@
    }
   },
   {
-   "name": "18 matrix: own sailing, other power-driven, in sight",
+   "name": "18 matrix: self sailing, other power-driven, in sight",
    "status": "binding",
-   "narrative": "Own is sailing; the other vessel is power-driven. Both underway and in sight of one another.",
+   "narrative": "Self is sailing; the other vessel is power-driven. Both underway and in sight of one another.",
    "expect": [
     "rule:11",
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:sail",
       "fact:activity": "activity:none",
@@ -576,15 +590,15 @@
    }
   },
   {
-   "name": "18 matrix: own sailing, other sailing, in sight",
+   "name": "18 matrix: self sailing, other sailing, in sight",
    "status": "binding",
-   "narrative": "Own is sailing; the other vessel is sailing. Both underway and in sight of one another.",
+   "narrative": "Self is sailing; the other vessel is sailing. Both underway and in sight of one another.",
    "expect": [
     "rule:11",
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:sail",
       "fact:activity": "activity:none",
@@ -610,16 +624,16 @@
    }
   },
   {
-   "name": "18 matrix: own sailing, other fishing (power), in sight",
+   "name": "18 matrix: self sailing, other fishing (power), in sight",
    "status": "binding",
-   "narrative": "Own is sailing; the other vessel is fishing (power). Both underway and in sight of one another.",
+   "narrative": "Self is sailing; the other vessel is fishing (power). Both underway and in sight of one another.",
    "expect": [
     "rule:11",
     "rule:18b_iii",
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:sail",
       "fact:activity": "activity:none",
@@ -645,16 +659,16 @@
    }
   },
   {
-   "name": "18 matrix: own sailing, other not under command, in sight",
+   "name": "18 matrix: self sailing, other not under command, in sight",
    "status": "binding",
-   "narrative": "Own is sailing; the other vessel is not under command. Both underway and in sight of one another.",
+   "narrative": "Self is sailing; the other vessel is not under command. Both underway and in sight of one another.",
    "expect": [
     "rule:11",
     "rule:18b_i",
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:sail",
       "fact:activity": "activity:none",
@@ -680,16 +694,16 @@
    }
   },
   {
-   "name": "18 matrix: own sailing, other restricted in her ability to manoeuvre, in sight",
+   "name": "18 matrix: self sailing, other restricted in her ability to manoeuvre, in sight",
    "status": "binding",
-   "narrative": "Own is sailing; the other vessel is restricted in her ability to manoeuvre. Both underway and in sight of one another.",
+   "narrative": "Self is sailing; the other vessel is restricted in her ability to manoeuvre. Both underway and in sight of one another.",
    "expect": [
     "rule:11",
     "rule:18b_ii",
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:sail",
       "fact:activity": "activity:none",
@@ -715,19 +729,19 @@
    }
   },
   {
-   "name": "18 matrix: own sailing, other constrained by her draught, in sight",
+   "name": "18 matrix: self sailing, other constrained by her draught, in sight",
    "status": "binding",
-   "narrative": "Own is sailing; the other vessel is constrained by her draught. Both underway and in sight of one another.",
+   "narrative": "Self is sailing; the other vessel is constrained by her draught. Both underway and in sight of one another.",
    "expect": [
     "rule:11",
     {
      "entry": "rule:18d_i",
-     "modality": "shall-if-practicable"
+     "modality": "modality:shall-if-practicable"
     },
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:sail",
       "fact:activity": "activity:none",
@@ -753,15 +767,15 @@
    }
   },
   {
-   "name": "18 matrix: own fishing (power), other power-driven, in sight",
+   "name": "18 matrix: self fishing (power), other power-driven, in sight",
    "status": "binding",
-   "narrative": "Own is fishing (power); the other vessel is power-driven. Both underway and in sight of one another.",
+   "narrative": "Self is fishing (power); the other vessel is power-driven. Both underway and in sight of one another.",
    "expect": [
     "rule:11",
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:fishing",
@@ -787,15 +801,15 @@
    }
   },
   {
-   "name": "18 matrix: own fishing (power), other sailing, in sight",
+   "name": "18 matrix: self fishing (power), other sailing, in sight",
    "status": "binding",
-   "narrative": "Own is fishing (power); the other vessel is sailing. Both underway and in sight of one another.",
+   "narrative": "Self is fishing (power); the other vessel is sailing. Both underway and in sight of one another.",
    "expect": [
     "rule:11",
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:fishing",
@@ -821,15 +835,15 @@
    }
   },
   {
-   "name": "18 matrix: own fishing (power), other fishing (power), in sight",
+   "name": "18 matrix: self fishing (power), other fishing (power), in sight",
    "status": "binding",
-   "narrative": "Own is fishing (power); the other vessel is fishing (power). Both underway and in sight of one another.",
+   "narrative": "Self is fishing (power); the other vessel is fishing (power). Both underway and in sight of one another.",
    "expect": [
     "rule:11",
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:fishing",
@@ -855,19 +869,19 @@
    }
   },
   {
-   "name": "18 matrix: own fishing (power), other not under command, in sight",
+   "name": "18 matrix: self fishing (power), other not under command, in sight",
    "status": "binding",
-   "narrative": "Own is fishing (power); the other vessel is not under command. Both underway and in sight of one another.",
+   "narrative": "Self is fishing (power); the other vessel is not under command. Both underway and in sight of one another.",
    "expect": [
     "rule:11",
     {
      "entry": "rule:18c_i",
-     "modality": "shall-if-practicable"
+     "modality": "modality:shall-if-practicable"
     },
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:fishing",
@@ -893,19 +907,19 @@
    }
   },
   {
-   "name": "18 matrix: own fishing (power), other restricted in her ability to manoeuvre, in sight",
+   "name": "18 matrix: self fishing (power), other restricted in her ability to manoeuvre, in sight",
    "status": "binding",
-   "narrative": "Own is fishing (power); the other vessel is restricted in her ability to manoeuvre. Both underway and in sight of one another.",
+   "narrative": "Self is fishing (power); the other vessel is restricted in her ability to manoeuvre. Both underway and in sight of one another.",
    "expect": [
     "rule:11",
     {
      "entry": "rule:18c_ii",
-     "modality": "shall-if-practicable"
+     "modality": "modality:shall-if-practicable"
     },
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:fishing",
@@ -931,19 +945,19 @@
    }
   },
   {
-   "name": "18 matrix: own fishing (power), other constrained by her draught, in sight",
+   "name": "18 matrix: self fishing (power), other constrained by her draught, in sight",
    "status": "binding",
-   "narrative": "Own is fishing (power); the other vessel is constrained by her draught. Both underway and in sight of one another.",
+   "narrative": "Self is fishing (power); the other vessel is constrained by her draught. Both underway and in sight of one another.",
    "expect": [
     "rule:11",
     {
      "entry": "rule:18d_i",
-     "modality": "shall-if-practicable"
+     "modality": "modality:shall-if-practicable"
     },
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:fishing",
@@ -969,15 +983,15 @@
    }
   },
   {
-   "name": "18 matrix: own not under command, other power-driven, in sight",
+   "name": "18 matrix: self not under command, other power-driven, in sight",
    "status": "binding",
-   "narrative": "Own is not under command: Rule 18 ranks her below nothing, so no paragraph of it applies to her and she carries no obligation here -- including against a vessel restricted in her ability to manoeuvre, which is the unordered pair at the top of the partial order.",
+   "narrative": "Self is not under command: Rule 18 ranks her below nothing, so no paragraph of it applies to her and she carries no obligation here -- including against a vessel restricted in her ability to manoeuvre, which is the unordered pair at the top of the partial order.",
    "expect": [
     "rule:11",
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:nuc",
@@ -1003,15 +1017,15 @@
    }
   },
   {
-   "name": "18 matrix: own not under command, other sailing, in sight",
+   "name": "18 matrix: self not under command, other sailing, in sight",
    "status": "binding",
-   "narrative": "Own is not under command: Rule 18 ranks her below nothing, so no paragraph of it applies to her and she carries no obligation here -- including against a vessel restricted in her ability to manoeuvre, which is the unordered pair at the top of the partial order.",
+   "narrative": "Self is not under command: Rule 18 ranks her below nothing, so no paragraph of it applies to her and she carries no obligation here -- including against a vessel restricted in her ability to manoeuvre, which is the unordered pair at the top of the partial order.",
    "expect": [
     "rule:11",
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:nuc",
@@ -1037,15 +1051,15 @@
    }
   },
   {
-   "name": "18 matrix: own not under command, other fishing (power), in sight",
+   "name": "18 matrix: self not under command, other fishing (power), in sight",
    "status": "binding",
-   "narrative": "Own is not under command: Rule 18 ranks her below nothing, so no paragraph of it applies to her and she carries no obligation here -- including against a vessel restricted in her ability to manoeuvre, which is the unordered pair at the top of the partial order.",
+   "narrative": "Self is not under command: Rule 18 ranks her below nothing, so no paragraph of it applies to her and she carries no obligation here -- including against a vessel restricted in her ability to manoeuvre, which is the unordered pair at the top of the partial order.",
    "expect": [
     "rule:11",
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:nuc",
@@ -1071,15 +1085,15 @@
    }
   },
   {
-   "name": "18 matrix: own not under command, other not under command, in sight",
+   "name": "18 matrix: self not under command, other not under command, in sight",
    "status": "binding",
-   "narrative": "Own is not under command: Rule 18 ranks her below nothing, so no paragraph of it applies to her and she carries no obligation here -- including against a vessel restricted in her ability to manoeuvre, which is the unordered pair at the top of the partial order.",
+   "narrative": "Self is not under command: Rule 18 ranks her below nothing, so no paragraph of it applies to her and she carries no obligation here -- including against a vessel restricted in her ability to manoeuvre, which is the unordered pair at the top of the partial order.",
    "expect": [
     "rule:11",
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:nuc",
@@ -1105,15 +1119,15 @@
    }
   },
   {
-   "name": "18 matrix: own not under command, other restricted in her ability to manoeuvre, in sight",
+   "name": "18 matrix: self not under command, other restricted in her ability to manoeuvre, in sight",
    "status": "binding",
-   "narrative": "Own is not under command: Rule 18 ranks her below nothing, so no paragraph of it applies to her and she carries no obligation here -- including against a vessel restricted in her ability to manoeuvre, which is the unordered pair at the top of the partial order.",
+   "narrative": "Self is not under command: Rule 18 ranks her below nothing, so no paragraph of it applies to her and she carries no obligation here -- including against a vessel restricted in her ability to manoeuvre, which is the unordered pair at the top of the partial order.",
    "expect": [
     "rule:11",
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:nuc",
@@ -1139,15 +1153,15 @@
    }
   },
   {
-   "name": "18 matrix: own not under command, other constrained by her draught, in sight",
+   "name": "18 matrix: self not under command, other constrained by her draught, in sight",
    "status": "binding",
-   "narrative": "Own is not under command: Rule 18 ranks her below nothing, so no paragraph of it applies to her and she carries no obligation here -- including against a vessel restricted in her ability to manoeuvre, which is the unordered pair at the top of the partial order.",
+   "narrative": "Self is not under command: Rule 18 ranks her below nothing, so no paragraph of it applies to her and she carries no obligation here -- including against a vessel restricted in her ability to manoeuvre, which is the unordered pair at the top of the partial order.",
    "expect": [
     "rule:11",
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:nuc",
@@ -1173,15 +1187,15 @@
    }
   },
   {
-   "name": "18 matrix: own restricted in her ability to manoeuvre, other power-driven, in sight",
+   "name": "18 matrix: self restricted in her ability to manoeuvre, other power-driven, in sight",
    "status": "binding",
-   "narrative": "Own is restricted in her ability to manoeuvre: nothing in Rule 18 is addressed to her, including against a vessel not under command. NUC and RAM are unordered.",
+   "narrative": "Self is restricted in her ability to manoeuvre: nothing in Rule 18 is addressed to her, including against a vessel not under command. NUC and RAM are unordered.",
    "expect": [
     "rule:11",
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:ram",
@@ -1207,15 +1221,15 @@
    }
   },
   {
-   "name": "18 matrix: own restricted in her ability to manoeuvre, other sailing, in sight",
+   "name": "18 matrix: self restricted in her ability to manoeuvre, other sailing, in sight",
    "status": "binding",
-   "narrative": "Own is restricted in her ability to manoeuvre: nothing in Rule 18 is addressed to her, including against a vessel not under command. NUC and RAM are unordered.",
+   "narrative": "Self is restricted in her ability to manoeuvre: nothing in Rule 18 is addressed to her, including against a vessel not under command. NUC and RAM are unordered.",
    "expect": [
     "rule:11",
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:ram",
@@ -1241,15 +1255,15 @@
    }
   },
   {
-   "name": "18 matrix: own restricted in her ability to manoeuvre, other fishing (power), in sight",
+   "name": "18 matrix: self restricted in her ability to manoeuvre, other fishing (power), in sight",
    "status": "binding",
-   "narrative": "Own is restricted in her ability to manoeuvre: nothing in Rule 18 is addressed to her, including against a vessel not under command. NUC and RAM are unordered.",
+   "narrative": "Self is restricted in her ability to manoeuvre: nothing in Rule 18 is addressed to her, including against a vessel not under command. NUC and RAM are unordered.",
    "expect": [
     "rule:11",
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:ram",
@@ -1275,15 +1289,15 @@
    }
   },
   {
-   "name": "18 matrix: own restricted in her ability to manoeuvre, other not under command, in sight",
+   "name": "18 matrix: self restricted in her ability to manoeuvre, other not under command, in sight",
    "status": "binding",
-   "narrative": "Own is restricted in her ability to manoeuvre: nothing in Rule 18 is addressed to her, including against a vessel not under command. NUC and RAM are unordered.",
+   "narrative": "Self is restricted in her ability to manoeuvre: nothing in Rule 18 is addressed to her, including against a vessel not under command. NUC and RAM are unordered.",
    "expect": [
     "rule:11",
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:ram",
@@ -1309,15 +1323,15 @@
    }
   },
   {
-   "name": "18 matrix: own restricted in her ability to manoeuvre, other restricted in her ability to manoeuvre, in sight",
+   "name": "18 matrix: self restricted in her ability to manoeuvre, other restricted in her ability to manoeuvre, in sight",
    "status": "binding",
-   "narrative": "Own is restricted in her ability to manoeuvre: nothing in Rule 18 is addressed to her, including against a vessel not under command. NUC and RAM are unordered.",
+   "narrative": "Self is restricted in her ability to manoeuvre: nothing in Rule 18 is addressed to her, including against a vessel not under command. NUC and RAM are unordered.",
    "expect": [
     "rule:11",
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:ram",
@@ -1343,15 +1357,15 @@
    }
   },
   {
-   "name": "18 matrix: own restricted in her ability to manoeuvre, other constrained by her draught, in sight",
+   "name": "18 matrix: self restricted in her ability to manoeuvre, other constrained by her draught, in sight",
    "status": "binding",
-   "narrative": "Own is restricted in her ability to manoeuvre: nothing in Rule 18 is addressed to her, including against a vessel not under command. NUC and RAM are unordered.",
+   "narrative": "Self is restricted in her ability to manoeuvre: nothing in Rule 18 is addressed to her, including against a vessel not under command. NUC and RAM are unordered.",
    "expect": [
     "rule:11",
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:ram",
@@ -1377,15 +1391,15 @@
    }
   },
   {
-   "name": "18 matrix: own constrained by her draught, other power-driven, in sight",
+   "name": "18 matrix: self constrained by her draught, other power-driven, in sight",
    "status": "binding",
-   "narrative": "Own is constrained by her draught; the other vessel is power-driven. Both underway and in sight of one another.",
+   "narrative": "Self is constrained by her draught; the other vessel is power-driven. Both underway and in sight of one another.",
    "expect": [
     "rule:11",
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:cbd",
@@ -1411,16 +1425,16 @@
    }
   },
   {
-   "name": "18 matrix: own constrained by her draught, other sailing, in sight",
+   "name": "18 matrix: self constrained by her draught, other sailing, in sight",
    "status": "binding",
-   "narrative": "Own is constrained by her draught; the other vessel is sailing. Both underway and in sight of one another.",
+   "narrative": "Self is constrained by her draught; the other vessel is sailing. Both underway and in sight of one another.",
    "expect": [
     "rule:11",
     "rule:18a_iv",
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:cbd",
@@ -1446,16 +1460,16 @@
    }
   },
   {
-   "name": "18 matrix: own constrained by her draught, other fishing (power), in sight",
+   "name": "18 matrix: self constrained by her draught, other fishing (power), in sight",
    "status": "binding",
-   "narrative": "Own is constrained by her draught; the other vessel is fishing (power). Both underway and in sight of one another.",
+   "narrative": "Self is constrained by her draught; the other vessel is fishing (power). Both underway and in sight of one another.",
    "expect": [
     "rule:11",
     "rule:18a_iii",
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:cbd",
@@ -1481,16 +1495,16 @@
    }
   },
   {
-   "name": "18 matrix: own constrained by her draught, other not under command, in sight",
+   "name": "18 matrix: self constrained by her draught, other not under command, in sight",
    "status": "binding",
-   "narrative": "Own is constrained by her draught; the other vessel is not under command. Both underway and in sight of one another.",
+   "narrative": "Self is constrained by her draught; the other vessel is not under command. Both underway and in sight of one another.",
    "expect": [
     "rule:11",
     "rule:18a_i",
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:cbd",
@@ -1516,16 +1530,16 @@
    }
   },
   {
-   "name": "18 matrix: own constrained by her draught, other restricted in her ability to manoeuvre, in sight",
+   "name": "18 matrix: self constrained by her draught, other restricted in her ability to manoeuvre, in sight",
    "status": "binding",
-   "narrative": "Own is constrained by her draught; the other vessel is restricted in her ability to manoeuvre. Both underway and in sight of one another.",
+   "narrative": "Self is constrained by her draught; the other vessel is restricted in her ability to manoeuvre. Both underway and in sight of one another.",
    "expect": [
     "rule:11",
     "rule:18a_ii",
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:cbd",
@@ -1551,19 +1565,19 @@
    }
   },
   {
-   "name": "18 matrix: own constrained by her draught, other constrained by her draught, in sight",
+   "name": "18 matrix: self constrained by her draught, other constrained by her draught, in sight",
    "status": "binding",
-   "narrative": "Own is constrained by her draught; the other vessel is constrained by her draught. Both underway and in sight of one another.",
+   "narrative": "Self is constrained by her draught; the other vessel is constrained by her draught. Both underway and in sight of one another.",
    "expect": [
     "rule:11",
     {
      "entry": "rule:18d_i",
-     "modality": "shall-if-practicable"
+     "modality": "modality:shall-if-practicable"
     },
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:cbd",
@@ -1589,19 +1603,19 @@
    }
   },
   {
-   "name": "18 matrix: own fishing under sail, other not under command, in sight",
+   "name": "18 matrix: self fishing under sail, other not under command, in sight",
    "status": "binding",
-   "narrative": "18(c) does not distinguish propulsion: a fishing vessel under sail is ranked by 18(c)(i), not by 18(b)(i), and both would otherwise match. This is the case that makes own's activity list, not her propulsion, the discriminator.",
+   "narrative": "18(c) does not distinguish propulsion: a fishing vessel under sail is ranked by 18(c)(i), not by 18(b)(i), and both would otherwise match. This is the case that makes self's activity list, not her propulsion, the discriminator.",
    "expect": [
     "rule:11",
     {
      "entry": "rule:18c_i",
-     "modality": "shall-if-practicable"
+     "modality": "modality:shall-if-practicable"
     },
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:sail",
       "fact:activity": "activity:fishing",
@@ -1627,15 +1641,15 @@
    }
   },
   {
-   "name": "18 matrix: own fishing under sail, other power-driven, in sight",
+   "name": "18 matrix: self fishing under sail, other power-driven, in sight",
    "status": "binding",
-   "narrative": "A fishing vessel under sail against an ordinary power-driven vessel: 18(a)(iii) gives the duty to the other vessel, so own carries none. The mirror of this case is the power-driven row.",
+   "narrative": "A fishing vessel under sail against an ordinary power-driven vessel: 18(a)(iii) gives the duty to the other vessel, so self carries none. The mirror of this case is the power-driven row.",
    "expect": [
     "rule:11",
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:sail",
       "fact:activity": "activity:fishing",
@@ -1661,7 +1675,7 @@
    }
   },
   {
-   "name": "scope: own power-driven, other not under command, NOT in sight",
+   "name": "scope: self power-driven, other not under command, NOT in sight",
    "status": "binding",
    "narrative": "The same facts as the in-sight matrix cell, with `pair:geo:in_sight` false. Section II falls away entirely -- 18(a)(i) does not apply -- and Rule 19 takes its place. This is the scope gate, asserted rather than described.",
    "expect": [
@@ -1669,7 +1683,7 @@
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:none",
@@ -1695,7 +1709,7 @@
    }
   },
   {
-   "name": "scope: own power-driven, other sailing, NOT in sight",
+   "name": "scope: self power-driven, other sailing, NOT in sight",
    "status": "binding",
    "narrative": "Section II is gated off; a sailing vessel gets no Rule 18 privilege from a vessel that cannot see her.",
    "expect": [
@@ -1703,7 +1717,7 @@
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:none",
@@ -1729,7 +1743,7 @@
    }
   },
   {
-   "name": "scope: own fishing, other restricted in her ability to manoeuvre, NOT in sight",
+   "name": "scope: self fishing, other restricted in her ability to manoeuvre, NOT in sight",
    "status": "binding",
    "narrative": "18(c)(ii) is Section II and falls away with it.",
    "expect": [
@@ -1737,7 +1751,7 @@
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:fishing",
@@ -1772,7 +1786,7 @@
     "rule:8f_iii"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:none",
@@ -1799,9 +1813,9 @@
    }
   },
   {
-   "name": "13(a) overrides 18(a)(iv): own sailing and overtaking a power-driven vessel",
+   "name": "13(a) overrides 18(a)(iv): self sailing and overtaking a power-driven vessel",
    "status": "binding",
-   "narrative": "Own is a sailing vessel that came up on a power-driven vessel from abaft her beam, so `own:hist:was_overtaking` is latched. Read from own's side 13(a) makes her give-way. Read from the other vessel's side -- the swapped situation -- 18(a)(iv) would make the power-driven vessel give-way to a sailing vessel, and 13(a)'s rel:overrides is what resolves the pair. The conflict is only visible across the swap, because a two-subject entry is evaluated from own's side alone.",
+   "narrative": "Self is a sailing vessel that came up on a power-driven vessel from abaft her beam, so `self:hist:was_overtaking` is latched. Read from self's side 13(a) makes her give-way. Read from the other vessel's side -- the swapped situation -- 18(a)(iv) would make the power-driven vessel give-way to a sailing vessel, and 13(a)'s rel:overrides is what resolves the pair. The conflict is only visible across the swap, because a two-subject entry is evaluated from self's side alone.",
    "expect": [
     "rule:11",
     "rule:13a",
@@ -1809,7 +1823,7 @@
     "rule:13d"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:sail",
       "fact:activity": "activity:none",
@@ -1848,7 +1862,7 @@
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:none",
@@ -1878,7 +1892,7 @@
   {
    "name": "18(f)(i) overrides 18(a)(iv): a WIG craft near the surface and a sailing vessel",
    "status": "binding",
-   "narrative": "Here both fire from own's side: 18(a)(iv) would make her give-way, 18(f)(i) makes her keep clear of all vessels. rule:18f_i's rel:overrides against rule:18a_iv is what stops that being two different roles for one subject in one situation.",
+   "narrative": "Here both fire from self's side: 18(a)(iv) would make her give-way, 18(f)(i) makes her keep clear of all vessels. rule:18f_i's rel:overrides against rule:18a_iv is what stops that being two different roles for one subject in one situation.",
    "expect": [
     "rule:11",
     "rule:18a_iv",
@@ -1886,7 +1900,7 @@
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:none",
@@ -1922,11 +1936,11 @@
     "rule:4",
     {
      "entry": "rule:9b",
-     "modality": "shall-not-impede"
+     "modality": "modality:shall-not-impede"
     }
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:sail",
       "fact:activity": "activity:none",
@@ -1965,15 +1979,15 @@
     "rule:4",
     {
      "entry": "rule:9b",
-     "modality": "shall-not-impede"
+     "modality": "modality:shall-not-impede"
     },
     {
      "entry": "rule:9c",
-     "modality": "shall-not-impede"
+     "modality": "modality:shall-not-impede"
     }
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:fishing",
@@ -2010,17 +2024,17 @@
    "expect": [
     {
      "entry": "rule:10i",
-     "modality": "shall-not-impede"
+     "modality": "modality:shall-not-impede"
     },
     {
      "entry": "rule:10j",
-     "modality": "shall-not-impede"
+     "modality": "modality:shall-not-impede"
     },
     "rule:11",
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:fishing",
@@ -2057,13 +2071,13 @@
    "expect": [
     {
      "entry": "rule:10j",
-     "modality": "shall-not-impede"
+     "modality": "modality:shall-not-impede"
     },
     "rule:11",
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:sail",
       "fact:activity": "activity:none",
@@ -2096,17 +2110,17 @@
   {
    "name": "9(b) length boundary: 19.9 m power-driven vessel in a narrow channel",
    "status": "binding",
-   "narrative": "REQ-VERIFY-5: the `own:fact:length_m: {lt: 20}` disjunct of rule:9b's `any_of` subject, isolated from the `propulsion:sail` disjunct and from rule:18a_iv by keeping both vessels power-driven -- no other predicate fires, so only the length gate decides.",
+   "narrative": "REQ-VERIFY-5: the `self:fact:length_m: {lt: 20}` disjunct of rule:9b's `any_of` subject, isolated from the `propulsion:sail` disjunct and from rule:18a_iv by keeping both vessels power-driven -- no other predicate fires, so only the length gate decides.",
    "expect": [
     "rule:11",
     "rule:4",
     {
      "entry": "rule:9b",
-     "modality": "shall-not-impede"
+     "modality": "modality:shall-not-impede"
     }
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:none",
@@ -2145,7 +2159,7 @@
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:none",
@@ -2184,11 +2198,11 @@
     "rule:4",
     {
      "entry": "rule:10j",
-     "modality": "shall-not-impede"
+     "modality": "modality:shall-not-impede"
     }
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:none",
@@ -2227,7 +2241,7 @@
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:none",
@@ -2266,7 +2280,7 @@
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:sail",
       "fact:activity": "activity:none",
@@ -2304,7 +2318,7 @@
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:sail",
       "fact:activity": "activity:none",
@@ -2343,7 +2357,7 @@
     "rule:4"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:sail",
       "fact:activity": "activity:none",
@@ -2377,7 +2391,7 @@
    "name": "27(c): other is towing in a way that severely restricts the pair, in sight",
    "status": "binding",
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:none",
@@ -2414,7 +2428,7 @@
    "name": "27(c): other is towing ordinarily, and Rule 18 does not rank her, in sight",
    "status": "binding",
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:none",
@@ -2450,7 +2464,7 @@
    "name": "27(c): other is being towed in a way that severely restricts the pair, in sight",
    "status": "binding",
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:none",
@@ -2483,9 +2497,9 @@
    "narrative": "3(g)(vi) names \"the towing vessel and her tow\" together, and the tow carries her own fact record -- so this side of the pair needs its own fixture: `activity:being_towed` plus `fact:tow_restricts_deviation` on her own record decodes her to `rule18_class:ram` exactly as the towing vessel's does. Before this fixture the decode row only matched `activity:towing`, and the tow herself fell through to her propulsion undetected."
   },
   {
-   "name": "13(b) edge: own bears exactly 112.5 from the other, and is not yet overtaking",
+   "name": "13(b) edge: self bears exactly 112.5 from the other, and is not yet overtaking",
    "status": "binding",
-   "narrative": "Own bears 112.5 relative from the other -- exactly 22.5 degrees abaft her beam, the forward edge of her sternlight arc. 13(b) says 'more than 22.5 degrees abaft her beam', so the edge itself is not an overtaking and the encounter is a crossing. The other bears 300 relative from own, on own's port bow, so own is the stand-on vessel and rule:15a:keep_out_of_the_way is absent from her side; it applies to the other vessel, which is the swapped situation and not what a fixture asserts.",
+   "narrative": "Self bears 112.5 relative from the other -- exactly 22.5 degrees abaft her beam, the forward edge of her sternlight arc. 13(b) says 'more than 22.5 degrees abaft her beam', so the edge itself is not an overtaking and the encounter is a crossing. The other bears 300 relative from self, on self's port bow, so self is the stand-on vessel and rule:15a:keep_out_of_the_way is absent from her side; it applies to the other vessel, which is the swapped situation and not what a fixture asserts.",
    "expect": [
     "rule:4",
     "rule:11",
@@ -2494,22 +2508,22 @@
     "rule:15a:crossing"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:none",
       "fact:position": "position:underway",
       "fact:making_way": true,
-      "fact:length_m": 30.0
+      "fact:length_m": 30
      },
      "kin": {
       "kin:heading_deg": 0,
-      "kin:sog_kn": 12.0,
+      "kin:sog_kn": 12,
       "kin:rot_deg_min": 0,
       "kin:dynamics": "dynamics:cargo"
      },
      "geo": {
-      "geo:rel_bearing_deg": 300.0
+      "geo:rel_bearing_deg": 300
      },
      "hist": {
       "hist:was_overtaking": false,
@@ -2522,7 +2536,7 @@
       "fact:activity": "activity:none",
       "fact:position": "position:underway",
       "fact:making_way": true,
-      "fact:length_m": 30.0
+      "fact:length_m": 30
      },
      "kin": {
       "kin:heading_deg": 7.5,
@@ -2541,7 +2555,7 @@
     "pair": {
      "geo": {
       "geo:range_m": 2000,
-      "geo:bearing_change_deg_min": 0.0,
+      "geo:bearing_change_deg_min": 0,
       "geo:cpa_m": 2,
       "geo:tcpa_s": 2294,
       "geo:in_sight": true,
@@ -2551,9 +2565,9 @@
    }
   },
   {
-   "name": "13(b) edge: own bears 112.6 from the other, one tenth of a degree into the sector",
+   "name": "13(b) edge: self bears 112.6 from the other, one tenth of a degree into the sector",
    "status": "binding",
-   "narrative": "The same edge from the other side of it. A tenth of a degree further abaft the other's beam and the encounter is an overtaking: rule:13b classifies it and rule:13a lays the duty on own. rule:15a:crossing is excluded by the sector, not by a hand-written crossing sector, which is the property the partition test asserts over the whole circle.",
+   "narrative": "The same edge from the other side of it. A tenth of a degree further abaft the other's beam and the encounter is an overtaking: rule:13b classifies it and rule:13a lays the duty on self. rule:15a:crossing is excluded by the sector, not by a hand-written crossing sector, which is the property the partition test asserts over the whole circle.",
    "expect": [
     "rule:4",
     "rule:11",
@@ -2563,22 +2577,22 @@
     "rule:13b"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:none",
       "fact:position": "position:underway",
       "fact:making_way": true,
-      "fact:length_m": 30.0
+      "fact:length_m": 30
      },
      "kin": {
       "kin:heading_deg": 0,
-      "kin:sog_kn": 14.0,
+      "kin:sog_kn": 14,
       "kin:rot_deg_min": 0,
       "kin:dynamics": "dynamics:cargo"
      },
      "geo": {
-      "geo:rel_bearing_deg": 350.0
+      "geo:rel_bearing_deg": 350
      },
      "hist": {
       "hist:was_overtaking": false,
@@ -2591,7 +2605,7 @@
       "fact:activity": "activity:none",
       "fact:position": "position:underway",
       "fact:making_way": true,
-      "fact:length_m": 30.0
+      "fact:length_m": 30
      },
      "kin": {
       "kin:heading_deg": 57.4,
@@ -2610,7 +2624,7 @@
     "pair": {
      "geo": {
       "geo:range_m": 1200,
-      "geo:bearing_change_deg_min": 0.0,
+      "geo:bearing_change_deg_min": 0,
       "geo:cpa_m": 0,
       "geo:tcpa_s": 183,
       "geo:in_sight": true,
@@ -2620,9 +2634,9 @@
    }
   },
   {
-   "name": "13(b) edge: own bears exactly 247.5 from the other, the mirror of the same edge",
+   "name": "13(b) edge: self bears exactly 247.5 from the other, the mirror of the same edge",
    "status": "binding",
-   "narrative": "The port-quarter edge, 112.5 degrees the other way round. Not overtaking, so a crossing; and the other bears 010 relative from own, on her starboard bow, so own is the give-way vessel. Own is inside the head-on cone and the other is not, which is why rule:14b does not apply: 14(b) is a statement about both aspects, and the `any_of` that negates it needs only one of them outside.",
+   "narrative": "The port-quarter edge, 112.5 degrees the other way round. Not overtaking, so a crossing; and the other bears 010 relative from self, on her starboard bow, so self is the give-way vessel. Self is inside the head-on cone and the other is not, which is why rule:14b does not apply: 14(b) is a statement about both aspects, and the `any_of` that negates it needs only one of them outside.",
    "expect": [
     "rule:4",
     "rule:11",
@@ -2632,22 +2646,22 @@
     "rule:15a:keep_out_of_the_way"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:none",
       "fact:position": "position:underway",
       "fact:making_way": true,
-      "fact:length_m": 30.0
+      "fact:length_m": 30
      },
      "kin": {
       "kin:heading_deg": 0,
-      "kin:sog_kn": 14.0,
+      "kin:sog_kn": 14,
       "kin:rot_deg_min": 0,
       "kin:dynamics": "dynamics:cargo"
      },
      "geo": {
-      "geo:rel_bearing_deg": 10.0
+      "geo:rel_bearing_deg": 10
      },
      "hist": {
       "hist:was_overtaking": false,
@@ -2660,7 +2674,7 @@
       "fact:activity": "activity:none",
       "fact:position": "position:underway",
       "fact:making_way": true,
-      "fact:length_m": 30.0
+      "fact:length_m": 30
      },
      "kin": {
       "kin:heading_deg": 302.5,
@@ -2679,7 +2693,7 @@
     "pair": {
      "geo": {
       "geo:range_m": 1200,
-      "geo:bearing_change_deg_min": 0.0,
+      "geo:bearing_change_deg_min": 0,
       "geo:cpa_m": 0,
       "geo:tcpa_s": 183,
       "geo:in_sight": true,
@@ -2689,7 +2703,7 @@
    }
   },
   {
-   "name": "13(b) edge: own bears 247.4 from the other, one tenth of a degree into the sector",
+   "name": "13(b) edge: self bears 247.4 from the other, one tenth of a degree into the sector",
    "status": "binding",
    "narrative": "The mirror of the 112.6 case. Overtaking, and the give-way entry that applied a tenth of a degree away is gone -- the two sit either side of one number, which is the point of declaring it once.",
    "expect": [
@@ -2701,22 +2715,22 @@
     "rule:13b"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:none",
       "fact:position": "position:underway",
       "fact:making_way": true,
-      "fact:length_m": 30.0
+      "fact:length_m": 30
      },
      "kin": {
       "kin:heading_deg": 0,
-      "kin:sog_kn": 14.0,
+      "kin:sog_kn": 14,
       "kin:rot_deg_min": 0,
       "kin:dynamics": "dynamics:cargo"
      },
      "geo": {
-      "geo:rel_bearing_deg": 10.0
+      "geo:rel_bearing_deg": 10
      },
      "hist": {
       "hist:was_overtaking": false,
@@ -2729,7 +2743,7 @@
       "fact:activity": "activity:none",
       "fact:position": "position:underway",
       "fact:making_way": true,
-      "fact:length_m": 30.0
+      "fact:length_m": 30
      },
      "kin": {
       "kin:heading_deg": 302.6,
@@ -2748,7 +2762,7 @@
     "pair": {
      "geo": {
       "geo:range_m": 1200,
-      "geo:bearing_change_deg_min": 0.0,
+      "geo:bearing_change_deg_min": 0,
       "geo:cpa_m": 0,
       "geo:tcpa_s": 183,
       "geo:in_sight": true,
@@ -2758,9 +2772,9 @@
    }
   },
   {
-   "name": "13(b): own is the vessel being overtaken, and the encounter is still an overtaking",
+   "name": "13(b): self is the vessel being overtaken, and the encounter is still an overtaking",
    "status": "binding",
-   "narrative": "The other bears 200 relative from own and is coming up fast on own's port quarter. The aspect is 005 -- own is nearly ahead of the other -- and reading aspect alone would have made this a crossing on own's side and an overtaking on the other's, one encounter with two names. rule:13b reads the sector on either subject, which stops that. rule:13a is correctly absent: own is not the vessel that keeps out of the way.",
+   "narrative": "The other bears 200 relative from self and is coming up fast on self's port quarter. The aspect is 005 -- self is nearly ahead of the other -- and reading aspect alone would have made this a crossing on self's side and an overtaking on the other's, one encounter with two names. rule:13b reads the sector on either subject, which stops that. rule:13a is correctly absent: self is not the vessel that keeps out of the way.",
    "expect": [
     "rule:4",
     "rule:11",
@@ -2769,22 +2783,22 @@
     "rule:13b"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:none",
       "fact:position": "position:underway",
       "fact:making_way": true,
-      "fact:length_m": 30.0
+      "fact:length_m": 30
      },
      "kin": {
       "kin:heading_deg": 0,
-      "kin:sog_kn": 3.0,
+      "kin:sog_kn": 3,
       "kin:rot_deg_min": 0,
       "kin:dynamics": "dynamics:fishing"
      },
      "geo": {
-      "geo:rel_bearing_deg": 200.0
+      "geo:rel_bearing_deg": 200
      },
      "hist": {
       "hist:was_overtaking": false,
@@ -2797,16 +2811,16 @@
       "fact:activity": "activity:none",
       "fact:position": "position:underway",
       "fact:making_way": true,
-      "fact:length_m": 30.0
+      "fact:length_m": 30
      },
      "kin": {
-      "kin:heading_deg": 15.0,
+      "kin:heading_deg": 15,
       "kin:sog_kn": 11.8,
       "kin:rot_deg_min": 0,
       "kin:dynamics": "dynamics:cargo"
      },
      "geo": {
-      "geo:rel_bearing_deg": 5.0
+      "geo:rel_bearing_deg": 5
      },
      "hist": {
       "hist:was_overtaking": false,
@@ -2816,7 +2830,7 @@
     "pair": {
      "geo": {
       "geo:range_m": 900,
-      "geo:bearing_change_deg_min": 0.0,
+      "geo:bearing_change_deg_min": 0,
       "geo:cpa_m": 0,
       "geo:tcpa_s": 196,
       "geo:in_sight": true,
@@ -2828,7 +2842,7 @@
   {
    "name": "14 edge: both aspects exactly one point, the widest head-on the constant admits",
    "status": "binding",
-   "narrative": "Own bears 348.75 relative from the other and the other bears 011.25 from own -- both exactly at `head_on_half_angle_deg`, one point of the compass. The cone is closed at the edge, so this is a head-on situation. Courses are 000 and 202.5, twenty-two and a half degrees off reciprocal, which is the widest pair the pencilled constant admits and the fixture that will change if the constant does.",
+   "narrative": "Self bears 348.75 relative from the other and the other bears 011.25 from self -- both exactly at `head_on_half_angle_deg`, one point of the compass. The cone is closed at the edge, so this is a head-on situation. Courses are 000 and 202.5, twenty-two and a half degrees off reciprocal, which is the widest pair the pencilled constant admits and the fixture that will change if the constant does.",
    "expect": [
     "rule:4",
     "rule:11",
@@ -2837,17 +2851,17 @@
     "rule:14b"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:none",
       "fact:position": "position:underway",
       "fact:making_way": true,
-      "fact:length_m": 30.0
+      "fact:length_m": 30
      },
      "kin": {
       "kin:heading_deg": 0,
-      "kin:sog_kn": 12.0,
+      "kin:sog_kn": 12,
       "kin:rot_deg_min": 0,
       "kin:dynamics": "dynamics:ferry"
      },
@@ -2865,11 +2879,11 @@
       "fact:activity": "activity:none",
       "fact:position": "position:underway",
       "fact:making_way": true,
-      "fact:length_m": 30.0
+      "fact:length_m": 30
      },
      "kin": {
       "kin:heading_deg": 202.5,
-      "kin:sog_kn": 12.0,
+      "kin:sog_kn": 12,
       "kin:rot_deg_min": 0,
       "kin:dynamics": "dynamics:ferry"
      },
@@ -2884,7 +2898,7 @@
     "pair": {
      "geo": {
       "geo:range_m": 1500,
-      "geo:bearing_change_deg_min": 0.0,
+      "geo:bearing_change_deg_min": 0,
       "geo:cpa_m": 0,
       "geo:tcpa_s": 124,
       "geo:in_sight": true,
@@ -2896,7 +2910,7 @@
   {
    "name": "14 edge: one twentieth of a degree wider, and the same situation is a crossing",
    "status": "binding",
-   "narrative": "Own's bearing of the other moves from 11.25 to 11.3 and nothing else changes. The head-on cone no longer holds on both subjects, so rule:14b is gone and rule:15a:crossing takes it -- the residual, with no bearing left unclassified between the two fixtures. Own has the other on her starboard side, so she is give-way.",
+   "narrative": "Self's bearing of the other moves from 11.25 to 11.3 and nothing else changes. The head-on cone no longer holds on both subjects, so rule:14b is gone and rule:15a:crossing takes it -- the residual, with no bearing left unclassified between the two fixtures. Self has the other on her starboard side, so she is give-way.",
    "expect": [
     "rule:4",
     "rule:11",
@@ -2906,17 +2920,17 @@
     "rule:15a:keep_out_of_the_way"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:none",
       "fact:position": "position:underway",
       "fact:making_way": true,
-      "fact:length_m": 30.0
+      "fact:length_m": 30
      },
      "kin": {
       "kin:heading_deg": 0,
-      "kin:sog_kn": 12.0,
+      "kin:sog_kn": 12,
       "kin:rot_deg_min": 0,
       "kin:dynamics": "dynamics:ferry"
      },
@@ -2934,7 +2948,7 @@
       "fact:activity": "activity:none",
       "fact:position": "position:underway",
       "fact:making_way": true,
-      "fact:length_m": 30.0
+      "fact:length_m": 30
      },
      "kin": {
       "kin:heading_deg": 202.55,
@@ -2953,7 +2967,7 @@
     "pair": {
      "geo": {
       "geo:range_m": 1500,
-      "geo:bearing_change_deg_min": 0.0,
+      "geo:bearing_change_deg_min": 0,
       "geo:cpa_m": 0,
       "geo:tcpa_s": 124,
       "geo:in_sight": true,
@@ -2974,22 +2988,22 @@
     "rule:15a:keep_out_of_the_way"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:none",
       "fact:position": "position:underway",
       "fact:making_way": true,
-      "fact:length_m": 30.0
+      "fact:length_m": 30
      },
      "kin": {
       "kin:heading_deg": 0,
-      "kin:sog_kn": 12.0,
+      "kin:sog_kn": 12,
       "kin:rot_deg_min": 0,
       "kin:dynamics": "dynamics:cargo"
      },
      "geo": {
-      "geo:rel_bearing_deg": 40.0
+      "geo:rel_bearing_deg": 40
      },
      "hist": {
       "hist:was_overtaking": false,
@@ -3002,16 +3016,16 @@
       "fact:activity": "activity:none",
       "fact:position": "position:underway",
       "fact:making_way": true,
-      "fact:length_m": 30.0
+      "fact:length_m": 30
      },
      "kin": {
-      "kin:heading_deg": 300.0,
+      "kin:heading_deg": 300,
       "kin:sog_kn": 18.2,
       "kin:rot_deg_min": 0,
       "kin:dynamics": "dynamics:cargo"
      },
      "geo": {
-      "geo:rel_bearing_deg": 280.0
+      "geo:rel_bearing_deg": 280
      },
      "hist": {
       "hist:was_overtaking": false,
@@ -3039,22 +3053,22 @@
     "rule:11"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:none",
       "fact:position": "position:underway",
       "fact:making_way": true,
-      "fact:length_m": 30.0
+      "fact:length_m": 30
      },
      "kin": {
       "kin:heading_deg": 0,
-      "kin:sog_kn": 12.0,
+      "kin:sog_kn": 12,
       "kin:rot_deg_min": 0,
       "kin:dynamics": "dynamics:cargo"
      },
      "geo": {
-      "geo:rel_bearing_deg": 40.0
+      "geo:rel_bearing_deg": 40
      },
      "hist": {
       "hist:was_overtaking": false,
@@ -3067,16 +3081,16 @@
       "fact:activity": "activity:none",
       "fact:position": "position:underway",
       "fact:making_way": true,
-      "fact:length_m": 30.0
+      "fact:length_m": 30
      },
      "kin": {
-      "kin:heading_deg": 300.0,
+      "kin:heading_deg": 300,
       "kin:sog_kn": 18.2,
       "kin:rot_deg_min": 0,
       "kin:dynamics": "dynamics:cargo"
      },
      "geo": {
-      "geo:rel_bearing_deg": 280.0
+      "geo:rel_bearing_deg": 280
      },
      "hist": {
       "hist:was_overtaking": false,
@@ -3096,9 +3110,9 @@
    }
   },
   {
-   "name": "12(a)(i): own on the port tack, the other on the starboard tack",
+   "name": "12(a)(i): self on the port tack, the other on the starboard tack",
    "status": "binding",
-   "narrative": "Two sailing vessels approaching with the wind on different sides. Own has it on the port side and keeps out of the way. No encounter type is produced: Rules 14 and 15 are both gated on two power-driven vessels and Rule 12 has no deeming paragraph of its own, so the pair carries a role and no classification. That is a finding about the Rules rather than a gap in the data -- Q-43.",
+   "narrative": "Two sailing vessels approaching with the wind on different sides. Self has it on the port side and keeps out of the way. No encounter type is produced: Rules 14 and 15 are both gated on two power-driven vessels and Rule 12 has no deeming paragraph of its own, so the pair carries a role and no classification. That is a finding about the Rules rather than a gap in the data -- Q-43.",
    "expect": [
     "rule:4",
     "rule:11",
@@ -3107,23 +3121,23 @@
     "rule:12a_i"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:sail",
       "fact:activity": "activity:none",
       "fact:position": "position:underway",
       "fact:making_way": true,
-      "fact:length_m": 12.0
+      "fact:length_m": 12
      },
      "kin": {
       "kin:heading_deg": 0,
-      "kin:sog_kn": 6.0,
+      "kin:sog_kn": 6,
       "kin:rot_deg_min": 0,
       "kin:dynamics": "dynamics:yacht",
       "kin:wind_side": "wind_side:port"
      },
      "geo": {
-      "geo:rel_bearing_deg": 45.0,
+      "geo:rel_bearing_deg": 45,
       "geo:windward": false
      },
      "hist": {
@@ -3137,17 +3151,17 @@
       "fact:activity": "activity:none",
       "fact:position": "position:underway",
       "fact:making_way": true,
-      "fact:length_m": 11.0
+      "fact:length_m": 11
      },
      "kin": {
-      "kin:heading_deg": 285.0,
+      "kin:heading_deg": 285,
       "kin:sog_kn": 4.9,
       "kin:rot_deg_min": 0,
       "kin:dynamics": "dynamics:yacht",
       "kin:wind_side": "wind_side:starboard"
      },
      "geo": {
-      "geo:rel_bearing_deg": 300.0,
+      "geo:rel_bearing_deg": 300,
       "geo:windward": true
      },
      "hist": {
@@ -3158,7 +3172,7 @@
     "pair": {
      "geo": {
       "geo:range_m": 1500,
-      "geo:bearing_change_deg_min": 0.0,
+      "geo:bearing_change_deg_min": 0,
       "geo:cpa_m": 0,
       "geo:tcpa_s": 436,
       "geo:in_sight": true,
@@ -3168,7 +3182,7 @@
    }
   },
   {
-   "name": "12(a)(ii): both on the starboard tack, own to windward",
+   "name": "12(a)(ii): both on the starboard tack, self to windward",
    "status": "binding",
    "narrative": "The wind on the same side for both, so the windward vessel keeps clear. `geo:windward` is antisymmetric and the fixture states both halves of it, which is what makes the swapped reading -- the other vessel is not give-way -- an assertion rather than an absence.",
    "expect": [
@@ -3179,23 +3193,23 @@
     "rule:12a_ii"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:sail",
       "fact:activity": "activity:none",
       "fact:position": "position:underway",
       "fact:making_way": true,
-      "fact:length_m": 12.0
+      "fact:length_m": 12
      },
      "kin": {
       "kin:heading_deg": 0,
-      "kin:sog_kn": 6.0,
+      "kin:sog_kn": 6,
       "kin:rot_deg_min": 0,
       "kin:dynamics": "dynamics:yacht",
       "kin:wind_side": "wind_side:starboard"
      },
      "geo": {
-      "geo:rel_bearing_deg": 45.0,
+      "geo:rel_bearing_deg": 45,
       "geo:windward": true
      },
      "hist": {
@@ -3209,17 +3223,17 @@
       "fact:activity": "activity:none",
       "fact:position": "position:underway",
       "fact:making_way": true,
-      "fact:length_m": 11.0
+      "fact:length_m": 11
      },
      "kin": {
-      "kin:heading_deg": 285.0,
+      "kin:heading_deg": 285,
       "kin:sog_kn": 4.9,
       "kin:rot_deg_min": 0,
       "kin:dynamics": "dynamics:yacht",
       "kin:wind_side": "wind_side:starboard"
      },
      "geo": {
-      "geo:rel_bearing_deg": 300.0,
+      "geo:rel_bearing_deg": 300,
       "geo:windward": false
      },
      "hist": {
@@ -3230,7 +3244,7 @@
     "pair": {
      "geo": {
       "geo:range_m": 1500,
-      "geo:bearing_change_deg_min": 0.0,
+      "geo:bearing_change_deg_min": 0,
       "geo:cpa_m": 0,
       "geo:tcpa_s": 436,
       "geo:in_sight": true,
@@ -3240,9 +3254,9 @@
    }
   },
   {
-   "name": "12(a)(iii): own on the port tack and the other's tack cannot be determined",
+   "name": "12(a)(iii): self on the port tack and the other's tack cannot be determined",
    "status": "binding",
-   "narrative": "Own has the wind on the port side, sees a vessel to windward, and cannot tell which side that vessel has the wind on. `wind_side:unknown` is a declared value and not an absent fact, which is the only reason this paragraph is expressible at all: an absent fact satisfies nothing, so silence would have relieved own of the duty the paragraph exists to impose.",
+   "narrative": "Self has the wind on the port side, sees a vessel to windward, and cannot tell which side that vessel has the wind on. `wind_side:unknown` is a declared value and not an absent fact, which is the only reason this paragraph is expressible at all: an absent fact satisfies nothing, so silence would have relieved self of the duty the paragraph exists to impose.",
    "expect": [
     "rule:4",
     "rule:11",
@@ -3251,23 +3265,23 @@
     "rule:12a_iii"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:sail",
       "fact:activity": "activity:none",
       "fact:position": "position:underway",
       "fact:making_way": true,
-      "fact:length_m": 12.0
+      "fact:length_m": 12
      },
      "kin": {
       "kin:heading_deg": 0,
-      "kin:sog_kn": 6.0,
+      "kin:sog_kn": 6,
       "kin:rot_deg_min": 0,
       "kin:dynamics": "dynamics:yacht",
       "kin:wind_side": "wind_side:port"
      },
      "geo": {
-      "geo:rel_bearing_deg": 45.0,
+      "geo:rel_bearing_deg": 45,
       "geo:windward": false
      },
      "hist": {
@@ -3281,17 +3295,17 @@
       "fact:activity": "activity:none",
       "fact:position": "position:underway",
       "fact:making_way": true,
-      "fact:length_m": 11.0
+      "fact:length_m": 11
      },
      "kin": {
-      "kin:heading_deg": 285.0,
+      "kin:heading_deg": 285,
       "kin:sog_kn": 4.9,
       "kin:rot_deg_min": 0,
       "kin:dynamics": "dynamics:yacht",
       "kin:wind_side": "wind_side:unknown"
      },
      "geo": {
-      "geo:rel_bearing_deg": 300.0,
+      "geo:rel_bearing_deg": 300,
       "geo:windward": true
      },
      "hist": {
@@ -3302,7 +3316,7 @@
     "pair": {
      "geo": {
       "geo:range_m": 1500,
-      "geo:bearing_change_deg_min": 0.0,
+      "geo:bearing_change_deg_min": 0,
       "geo:cpa_m": 0,
       "geo:tcpa_s": 436,
       "geo:in_sight": true,
@@ -3312,9 +3326,9 @@
    }
   },
   {
-   "name": "12 does not apply: both on the starboard tack and own to leeward",
+   "name": "12 does not apply: both on the starboard tack and self to leeward",
    "status": "binding",
-   "narrative": "The exclusion case for all three of Rule 12. Same tack rules out 12(a)(i), own to leeward rules out 12(a)(ii), and the other's tack being known rules out 12(a)(iii). The leeward vessel is stand-on and the entry that says so is rule:12a_ii read on the swapped situation, which is why nothing appears here.",
+   "narrative": "The exclusion case for all three of Rule 12. Same tack rules out 12(a)(i), self to leeward rules out 12(a)(ii), and the other's tack being known rules out 12(a)(iii). The leeward vessel is stand-on and the entry that says so is rule:12a_ii read on the swapped situation, which is why nothing appears here.",
    "expect": [
     "rule:4",
     "rule:11",
@@ -3322,23 +3336,23 @@
     "rule:8f_iii"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:sail",
       "fact:activity": "activity:none",
       "fact:position": "position:underway",
       "fact:making_way": true,
-      "fact:length_m": 12.0
+      "fact:length_m": 12
      },
      "kin": {
       "kin:heading_deg": 0,
-      "kin:sog_kn": 6.0,
+      "kin:sog_kn": 6,
       "kin:rot_deg_min": 0,
       "kin:dynamics": "dynamics:yacht",
       "kin:wind_side": "wind_side:starboard"
      },
      "geo": {
-      "geo:rel_bearing_deg": 45.0,
+      "geo:rel_bearing_deg": 45,
       "geo:windward": false
      },
      "hist": {
@@ -3352,17 +3366,17 @@
       "fact:activity": "activity:none",
       "fact:position": "position:underway",
       "fact:making_way": true,
-      "fact:length_m": 11.0
+      "fact:length_m": 11
      },
      "kin": {
-      "kin:heading_deg": 285.0,
+      "kin:heading_deg": 285,
       "kin:sog_kn": 4.9,
       "kin:rot_deg_min": 0,
       "kin:dynamics": "dynamics:yacht",
       "kin:wind_side": "wind_side:starboard"
      },
      "geo": {
-      "geo:rel_bearing_deg": 300.0,
+      "geo:rel_bearing_deg": 300,
       "geo:windward": true
      },
      "hist": {
@@ -3373,7 +3387,7 @@
     "pair": {
      "geo": {
       "geo:range_m": 1500,
-      "geo:bearing_change_deg_min": 0.0,
+      "geo:bearing_change_deg_min": 0,
       "geo:cpa_m": 0,
       "geo:tcpa_s": 436,
       "geo:in_sight": true,
@@ -3383,9 +3397,9 @@
    }
   },
   {
-   "name": "12 under 18(b)(iii): own fishing under sail on the port tack, the other a sailing vessel on the starboard tack",
+   "name": "12 under 18(b)(iii): self fishing under sail on the port tack, the other a sailing vessel on the starboard tack",
    "status": "binding",
-   "narrative": "The same crossing as the 12(a)(i) case, with own now engaged in fishing under sail. She is a sailing vessel by 3(c) -- her machinery is not in use -- so 12(a)(i) applies from her side and would make her give way, being on the port tack. She is also a vessel engaged in fishing by 3(d), so from the other vessel's side 18(b)(iii) applies and makes the other keep out of her way. Both are in force; Rule 18's opening words except Rules 9, 10 and 13 and not Rule 12, so rule:18b_iii carries rel:overrides against rule:12a_i and own resolves to stand-on. This fixture asserts applicability from own's side, which is rule:12a_i; the resolution is asserted by the pooled-roles tests, and before this PR own was simply outside Rule 12, which was Q-40's finding.",
+   "narrative": "The same crossing as the 12(a)(i) case, with self now engaged in fishing under sail. She is a sailing vessel by 3(c) -- her machinery is not in use -- so 12(a)(i) applies from her side and would make her give way, being on the port tack. She is also a vessel engaged in fishing by 3(d), so from the other vessel's side 18(b)(iii) applies and makes the other keep out of her way. Both are in force; Rule 18's opening words except Rules 9, 10 and 13 and not Rule 12, so rule:18b_iii carries rel:overrides against rule:12a_i and self resolves to stand-on. This fixture asserts applicability from self's side, which is rule:12a_i; the resolution is asserted by the pooled-roles tests, and before this PR self was simply outside Rule 12, which was Q-40's finding.",
    "expect": [
     "rule:4",
     "rule:11",
@@ -3394,23 +3408,23 @@
     "rule:12a_i"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:sail",
       "fact:activity": "activity:fishing",
       "fact:position": "position:underway",
       "fact:making_way": true,
-      "fact:length_m": 16.0
+      "fact:length_m": 16
      },
      "kin": {
       "kin:heading_deg": 0,
-      "kin:sog_kn": 6.0,
+      "kin:sog_kn": 6,
       "kin:rot_deg_min": 0,
       "kin:dynamics": "dynamics:fishing",
       "kin:wind_side": "wind_side:port"
      },
      "geo": {
-      "geo:rel_bearing_deg": 45.0,
+      "geo:rel_bearing_deg": 45,
       "geo:windward": false
      },
      "hist": {
@@ -3424,17 +3438,17 @@
       "fact:activity": "activity:none",
       "fact:position": "position:underway",
       "fact:making_way": true,
-      "fact:length_m": 11.0
+      "fact:length_m": 11
      },
      "kin": {
-      "kin:heading_deg": 285.0,
+      "kin:heading_deg": 285,
       "kin:sog_kn": 4.9,
       "kin:rot_deg_min": 0,
       "kin:dynamics": "dynamics:yacht",
       "kin:wind_side": "wind_side:starboard"
      },
      "geo": {
-      "geo:rel_bearing_deg": 300.0,
+      "geo:rel_bearing_deg": 300,
       "geo:windward": true
      },
      "hist": {
@@ -3447,7 +3461,7 @@
       "geo:range_m": 1500,
       "geo:cpa_m": 0,
       "geo:tcpa_s": 436,
-      "geo:bearing_change_deg_min": 0.0,
+      "geo:bearing_change_deg_min": 0,
       "geo:in_sight": true,
       "geo:risk_of_collision": true
      }
@@ -3455,9 +3469,9 @@
    }
   },
   {
-   "name": "13 over 12: own overtaking a windward vessel on the same tack from dead astern",
+   "name": "13 over 12: self overtaking a windward vessel on the same tack from dead astern",
    "status": "binding",
-   "narrative": "Two sailing vessels on the starboard tack, own to leeward and coming up from dead astern at twice the other's speed. From own's side 13(a) and 13(b) apply and 12(a)(ii) does not -- own is not the windward vessel. From the other's side 12(a)(ii) does apply and would make her, the windward vessel, keep out of the way of own. 13(a) is 'notwithstanding anything contained in' the Rules of Part B Sections I and II, which is Rule 12 among others, so rule:13a carries rel:overrides against the three Rule 12 entries and the overtaken vessel resolves to stand-on. Steady bearing: dead ahead and dead astern, closing at three knots.",
+   "narrative": "Two sailing vessels on the starboard tack, self to leeward and coming up from dead astern at twice the other's speed. From self's side 13(a) and 13(b) apply and 12(a)(ii) does not -- self is not the windward vessel. From the other's side 12(a)(ii) does apply and would make her, the windward vessel, keep out of the way of self. 13(a) is 'notwithstanding anything contained in' the Rules of Part B Sections I and II, which is Rule 12 among others, so rule:13a carries rel:overrides against the three Rule 12 entries and the overtaken vessel resolves to stand-on. Steady bearing: dead ahead and dead astern, closing at three knots.",
    "expect": [
     "rule:4",
     "rule:11",
@@ -3467,23 +3481,23 @@
     "rule:13b"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:sail",
       "fact:activity": "activity:none",
       "fact:position": "position:underway",
       "fact:making_way": true,
-      "fact:length_m": 12.0
+      "fact:length_m": 12
      },
      "kin": {
       "kin:heading_deg": 0,
-      "kin:sog_kn": 6.0,
+      "kin:sog_kn": 6,
       "kin:rot_deg_min": 0,
       "kin:dynamics": "dynamics:yacht",
       "kin:wind_side": "wind_side:starboard"
      },
      "geo": {
-      "geo:rel_bearing_deg": 0.0,
+      "geo:rel_bearing_deg": 0,
       "geo:windward": false
      },
      "hist": {
@@ -3497,17 +3511,17 @@
       "fact:activity": "activity:none",
       "fact:position": "position:underway",
       "fact:making_way": true,
-      "fact:length_m": 11.0
+      "fact:length_m": 11
      },
      "kin": {
       "kin:heading_deg": 0,
-      "kin:sog_kn": 3.0,
+      "kin:sog_kn": 3,
       "kin:rot_deg_min": 0,
       "kin:dynamics": "dynamics:yacht",
       "kin:wind_side": "wind_side:starboard"
      },
      "geo": {
-      "geo:rel_bearing_deg": 180.0,
+      "geo:rel_bearing_deg": 180,
       "geo:windward": true
      },
      "hist": {
@@ -3520,7 +3534,7 @@
       "geo:range_m": 500,
       "geo:cpa_m": 0,
       "geo:tcpa_s": 324,
-      "geo:bearing_change_deg_min": 0.0,
+      "geo:bearing_change_deg_min": 0,
       "geo:in_sight": true,
       "geo:risk_of_collision": true
      }
@@ -3528,9 +3542,9 @@
    }
   },
   {
-   "name": "15 between two fishing vessels: both under power, the other on own's starboard side",
+   "name": "15 between two fishing vessels: both under power, the other on self's starboard side",
    "status": "binding",
-   "narrative": "Two vessels engaged in fishing, both propelled by machinery, crossing in sight on a steady bearing at 1500 m. Rule 18 orders neither of them: 18(a) speaks for a power-driven vessel that is not herself ranked by Rule 18, and 18(c) ranks a fishing vessel only against a vessel not under command and one restricted in her ability to manoeuvre. So no Rule 18 norm is in force between this pair. 15(a)'s \"two power-driven vessels\" is 3(b), and a vessel engaged in fishing whose machinery is in use is a power-driven vessel, so Rule 15 is the only norm that assigns a role here: own has the other on her own starboard side and keeps out of the way, the other stands on. Before this PR `rule:15a:keep_out_of_the_way` negated the four Rule 18 ranks on both subjects, so neither vessel took a helm role and the pair was ungoverned -- which is the finding this fixture was written to record.",
+   "narrative": "Two vessels engaged in fishing, both propelled by machinery, crossing in sight on a steady bearing at 1500 m. Rule 18 orders neither of them: 18(a) speaks for a power-driven vessel that is not herself ranked by Rule 18, and 18(c) ranks a fishing vessel only against a vessel not under command and one restricted in her ability to manoeuvre. So no Rule 18 norm is in force between this pair. 15(a)'s \"two power-driven vessels\" is 3(b), and a vessel engaged in fishing whose machinery is in use is a power-driven vessel, so Rule 15 is the only norm that assigns a role here: self has the other on her own starboard side and keeps out of the way, the other stands on. Before this PR `rule:15a:keep_out_of_the_way` negated the four Rule 18 ranks on both subjects, so neither vessel took a helm role and the pair was ungoverned -- which is the finding this fixture was written to record.",
    "expect": [
     "rule:4",
     "rule:11",
@@ -3540,22 +3554,22 @@
     "rule:15a:keep_out_of_the_way"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:fishing",
       "fact:position": "position:underway",
       "fact:making_way": true,
-      "fact:length_m": 26.0
+      "fact:length_m": 26
      },
      "kin": {
       "kin:heading_deg": 0,
-      "kin:sog_kn": 6.0,
+      "kin:sog_kn": 6,
       "kin:rot_deg_min": 0,
       "kin:dynamics": "dynamics:fishing"
      },
      "geo": {
-      "geo:rel_bearing_deg": 45.0
+      "geo:rel_bearing_deg": 45
      },
      "hist": {
       "hist:was_overtaking": false,
@@ -3568,16 +3582,16 @@
       "fact:activity": "activity:fishing",
       "fact:position": "position:underway",
       "fact:making_way": true,
-      "fact:length_m": 22.0
+      "fact:length_m": 22
      },
      "kin": {
-      "kin:heading_deg": 285.0,
+      "kin:heading_deg": 285,
       "kin:sog_kn": 4.9,
       "kin:rot_deg_min": 0,
       "kin:dynamics": "dynamics:fishing"
      },
      "geo": {
-      "geo:rel_bearing_deg": 300.0
+      "geo:rel_bearing_deg": 300
      },
      "hist": {
       "hist:was_overtaking": false,
@@ -3589,7 +3603,7 @@
       "geo:range_m": 1500,
       "geo:cpa_m": 0,
       "geo:tcpa_s": 436,
-      "geo:bearing_change_deg_min": 0.0,
+      "geo:bearing_change_deg_min": 0,
       "geo:in_sight": true,
       "geo:risk_of_collision": true
      }
@@ -3599,7 +3613,7 @@
   {
    "name": "15 between NUC and RAM: both under power, and Rule 18 does not order them",
    "status": "binding",
-   "narrative": "The same crossing with own not under command and the other restricted in her ability to manoeuvre, both propelled by machinery. Rule 18 is a partial order and these two are its unordered pair -- neither 18(a), whose subject is a vessel Rule 18 does not rank, nor 18(c), whose subject is a fishing vessel, reaches them -- which the partial-order test already pins. Both are power-driven vessels by 3(b), so 15(a) applies and own, having the other on her own starboard side, is the give-way vessel. That lays a helm duty on a vessel which by 3(f) is unable to manoeuvre as the Rules require, and the model records it rather than gating it away: Rule 2 is what answers it (ADR 0005 sec. 5), the same position `rule:12a_i` takes for two sailing vessels Rule 18 leaves unordered. Q-40.",
+   "narrative": "The same crossing with self not under command and the other restricted in her ability to manoeuvre, both propelled by machinery. Rule 18 is a partial order and these two are its unordered pair -- neither 18(a), whose subject is a vessel Rule 18 does not rank, nor 18(c), whose subject is a fishing vessel, reaches them -- which the partial-order test already pins. Both are power-driven vessels by 3(b), so 15(a) applies and self, having the other on her own starboard side, is the give-way vessel. That lays a helm duty on a vessel which by 3(f) is unable to manoeuvre as the Rules require, and the model records it rather than gating it away: Rule 2 is what answers it (ADR 0005 sec. 5), the same position `rule:12a_i` takes for two sailing vessels Rule 18 leaves unordered. Q-40.",
    "expect": [
     "rule:4",
     "rule:11",
@@ -3609,22 +3623,22 @@
     "rule:15a:keep_out_of_the_way"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:nuc",
       "fact:position": "position:underway",
       "fact:making_way": true,
-      "fact:length_m": 80.0
+      "fact:length_m": 80
      },
      "kin": {
       "kin:heading_deg": 0,
-      "kin:sog_kn": 6.0,
+      "kin:sog_kn": 6,
       "kin:rot_deg_min": 0,
       "kin:dynamics": "dynamics:cargo"
      },
      "geo": {
-      "geo:rel_bearing_deg": 45.0
+      "geo:rel_bearing_deg": 45
      },
      "hist": {
       "hist:was_overtaking": false,
@@ -3637,16 +3651,16 @@
       "fact:activity": "activity:ram",
       "fact:position": "position:underway",
       "fact:making_way": true,
-      "fact:length_m": 65.0
+      "fact:length_m": 65
      },
      "kin": {
-      "kin:heading_deg": 285.0,
+      "kin:heading_deg": 285,
       "kin:sog_kn": 4.9,
       "kin:rot_deg_min": 0,
       "kin:dynamics": "dynamics:cargo"
      },
      "geo": {
-      "geo:rel_bearing_deg": 300.0
+      "geo:rel_bearing_deg": 300
      },
      "hist": {
       "hist:was_overtaking": false,
@@ -3658,7 +3672,7 @@
       "geo:range_m": 1500,
       "geo:cpa_m": 0,
       "geo:tcpa_s": 436,
-      "geo:bearing_change_deg_min": 0.0,
+      "geo:bearing_change_deg_min": 0,
       "geo:in_sight": true,
       "geo:risk_of_collision": true
      }
@@ -3668,7 +3682,7 @@
   {
    "name": "13(d) latch: 13(a)'s sector test suppressed on the newly-gaining vessel",
    "status": "binding",
-   "narrative": "Own already holds 13(d)'s latch from an earlier overtaking. Since then the pair has closed again from the other direction: the other now sits dead astern of own, gaining at three knots -- 13(a)'s sector test, read on her geometry alone, would newly name her give-way too. The latch forbids it: only own, the latch-holder, gives way (Q-47).",
+   "narrative": "Self already holds 13(d)'s latch from an earlier overtaking. Since then the pair has closed again from the other direction: the other now sits dead astern of self, gaining at three knots -- 13(a)'s sector test, read on her geometry alone, would newly name her give-way too. The latch forbids it: only self, the latch-holder, gives way (Q-47).",
    "expect": [
     "rule:4",
     "rule:11",
@@ -3679,7 +3693,7 @@
     "rule:13d"
    ],
    "situation": {
-    "own": {
+    "self": {
      "fact": {
       "fact:propulsion": "propulsion:power",
       "fact:activity": "activity:none",
@@ -3689,7 +3703,7 @@
      },
      "kin": {
       "kin:position": {
-       "latitude": 50.0,
+       "latitude": 50,
        "longitude": -1.4
       },
       "kin:heading_deg": 0,
@@ -3734,18 +3748,275 @@
     "pair": {
      "geo": {
       "geo:range_m": 500,
-      "geo:bearing_change_deg_min": 0.0,
+      "geo:bearing_change_deg_min": 0,
       "geo:cpa_m": 0,
-      "geo:tcpa_s": 324.0,
+      "geo:tcpa_s": 324,
       "geo:in_sight": true,
       "geo:risk_of_collision": true
      }
     }
    }
+  },
+  {
+   "name": "crossing: self power-driven, other fine on the port bow -- self is the stand-on vessel (ADR 0016)",
+   "status": "binding",
+   "narrative": "The mirror of the crossing above: the same two vessels, the other now bearing 320 relative at 3 nm on a steady bearing. The other has self on her starboard side, so self stands on under Rule 17 and the other gives way. No entry names self stand-on from her own seat; the role is rule:15a:keep_out_of_the_way read in the swapped frame, which is why this case states `roles` (ADR 0016, #141).",
+   "expect": [
+    "rule:4",
+    "rule:11",
+    "rule:7d_i",
+    "rule:8f_iii",
+    "rule:15a:crossing"
+   ],
+   "roles": {
+    "self": [
+     {
+      "role": "role:stand-on",
+      "by": "rule:15a:keep_out_of_the_way"
+     }
+    ],
+    "other": [
+     {
+      "role": "role:give-way",
+      "by": "rule:15a:keep_out_of_the_way"
+     }
+    ]
+   },
+   "situation": {
+    "self": {
+     "fact": {
+      "fact:propulsion": "propulsion:power",
+      "fact:activity": "activity:none",
+      "fact:position": "position:underway",
+      "fact:making_way": true,
+      "fact:length_m": 15
+     },
+     "kin": {
+      "kin:heading_deg": 0,
+      "kin:rot_deg_min": 0,
+      "kin:dynamics": "dynamics:yacht",
+      "kin:position": {
+       "latitude": 50,
+       "longitude": -1.4
+      },
+      "kin:sog_kn": 12
+     },
+     "geo": {
+      "geo:rel_bearing_deg": 320
+     },
+     "hist": {
+      "hist:was_overtaking": false,
+      "hist:latched_at_s": null
+     }
+    },
+    "other": {
+     "fact": {
+      "fact:propulsion": "propulsion:power",
+      "fact:activity": "activity:none",
+      "fact:position": "position:underway",
+      "fact:making_way": true,
+      "fact:length_m": 40
+     },
+     "kin": {
+      "kin:heading_deg": 60,
+      "kin:rot_deg_min": 0,
+      "kin:dynamics": "dynamics:cargo",
+      "kin:position": {
+       "latitude": 50.0383,
+       "longitude": -1.45
+      },
+      "kin:sog_kn": 7.83
+     },
+     "geo": {
+      "geo:rel_bearing_deg": 80
+     },
+     "hist": {
+      "hist:was_overtaking": false,
+      "hist:latched_at_s": null
+     }
+    },
+    "pair": {
+     "geo": {
+      "geo:in_sight": true,
+      "geo:risk_of_collision": true,
+      "geo:range_m": 5556,
+      "geo:bearing_change_deg_min": 0,
+      "geo:cpa_m": 1,
+      "geo:tcpa_s": 1023
+     }
+    }
+   }
+  },
+  {
+   "name": "18(a)(i) over 15(a) across frames: self not under command, ordinary power vessel on self's starboard bow (ADR 0016)",
+   "status": "binding",
+   "narrative": "Self is not under command, under power, with an ordinary power-driven vessel crossing from her starboard bow. From self's seat Rule 15 alone applies and would make her give way; 18(a)(i) fires only from the other vessel's seat, and its rel:overrides against rule:15a:keep_out_of_the_way reaches across the frames. Pooled, self stands on and the other gives way. One-seat evaluation tells both to give way (#141).",
+   "expect": [
+    "rule:4",
+    "rule:11",
+    "rule:8f_iii",
+    "rule:15a:crossing",
+    "rule:15a:keep_out_of_the_way"
+   ],
+   "roles": {
+    "self": [
+     {
+      "role": "role:stand-on",
+      "by": "rule:18a_i"
+     }
+    ],
+    "other": [
+     {
+      "role": "role:give-way",
+      "by": "rule:18a_i"
+     }
+    ]
+   },
+   "situation": {
+    "self": {
+     "fact": {
+      "fact:propulsion": "propulsion:power",
+      "fact:activity": "activity:nuc",
+      "fact:position": "position:underway",
+      "fact:making_way": true,
+      "fact:length_m": 30
+     },
+     "kin": {
+      "kin:heading_deg": 0,
+      "kin:rot_deg_min": 0,
+      "kin:dynamics": "dynamics:cargo",
+      "kin:sog_kn": 6
+     },
+     "geo": {
+      "geo:rel_bearing_deg": 40
+     },
+     "hist": {
+      "hist:was_overtaking": false,
+      "hist:latched_at_s": null
+     }
+    },
+    "other": {
+     "fact": {
+      "fact:propulsion": "propulsion:power",
+      "fact:activity": "activity:none",
+      "fact:position": "position:underway",
+      "fact:making_way": true,
+      "fact:length_m": 30
+     },
+     "kin": {
+      "kin:heading_deg": 270,
+      "kin:rot_deg_min": 0,
+      "kin:dynamics": "dynamics:cargo",
+      "kin:sog_kn": 12
+     },
+     "geo": {
+      "geo:rel_bearing_deg": 310
+     },
+     "hist": {
+      "hist:was_overtaking": false,
+      "hist:latched_at_s": null
+     }
+    },
+    "pair": {
+     "geo": {
+      "geo:in_sight": true,
+      "geo:risk_of_collision": true,
+      "geo:range_m": 2000,
+      "geo:bearing_change_deg_min": -4.72,
+      "geo:cpa_m": 795.4,
+      "geo:tcpa_s": 265.9
+     }
+    }
+   }
+  },
+  {
+   "name": "13(a) over 18(a)(iv) across frames: self power-driven, a sailing vessel overtaking her from the starboard quarter (ADR 0016)",
+   "status": "binding",
+   "narrative": "Self is an ordinary power-driven vessel making 3 knots; a sailing vessel comes up from 160 relative at 12 knots. From self's seat 18(a)(iv) applies and would make her keep out of the way; 13(a) fires only from the sailing vessel's seat, and its rel:overrides against rule:18a_iv reaches across the frames. Pooled, the overtaking vessel gives way and self stands on (ADR 0016, #141).",
+   "expect": [
+    "rule:4",
+    "rule:11",
+    "rule:7d_i",
+    "rule:8f_iii",
+    "rule:13b",
+    "rule:18a_iv"
+   ],
+   "roles": {
+    "self": [
+     {
+      "role": "role:stand-on",
+      "by": "rule:13a"
+     }
+    ],
+    "other": [
+     {
+      "role": "role:give-way",
+      "by": "rule:13a"
+     }
+    ]
+   },
+   "situation": {
+    "self": {
+     "fact": {
+      "fact:propulsion": "propulsion:power",
+      "fact:activity": "activity:none",
+      "fact:position": "position:underway",
+      "fact:making_way": true,
+      "fact:length_m": 30
+     },
+     "kin": {
+      "kin:heading_deg": 0,
+      "kin:rot_deg_min": 0,
+      "kin:dynamics": "dynamics:cargo",
+      "kin:sog_kn": 3
+     },
+     "geo": {
+      "geo:rel_bearing_deg": 160
+     },
+     "hist": {
+      "hist:was_overtaking": false,
+      "hist:latched_at_s": null
+     }
+    },
+    "other": {
+     "fact": {
+      "fact:propulsion": "propulsion:sail",
+      "fact:activity": "activity:none",
+      "fact:position": "position:underway",
+      "fact:making_way": true,
+      "fact:length_m": 30
+     },
+     "kin": {
+      "kin:heading_deg": 350,
+      "kin:sog_kn": 12,
+      "kin:rot_deg_min": 0,
+      "kin:dynamics": "dynamics:yacht",
+      "kin:wind_side": "wind_side:port"
+     },
+     "geo": {
+      "geo:rel_bearing_deg": 350,
+      "geo:windward": true
+     },
+     "hist": {
+      "hist:was_overtaking": false,
+      "hist:latched_at_s": null
+     }
+    },
+    "pair": {
+     "geo": {
+      "geo:in_sight": true,
+      "geo:risk_of_collision": true,
+      "geo:range_m": 2000,
+      "geo:bearing_change_deg_min": -0.94,
+      "geo:cpa_m": 233.5,
+      "geo:tcpa_s": 426.1
+     }
+    }
+   }
   }
  ],
  "override_note": "`expect` names every entry whose predicate the situation satisfies, including entries that a rel:overrides then displaces. Applicability and resolution are two steps: 18(a)(iv) really does apply to a WIG craft near the surface -- she is a power-driven vessel underway -- and 18(f)(i) overriding it is what the engine does next. A fixture that hid the overridden entry would make the override unobservable and the relation untestable.",
- "expect_scope": "`expect` names the non-`display` entries a situation selects -- `scope`, `precedence` and `classification`. Display entries are deliberately out of scope here: a situation carries `own.fact`, so every Part C entry that matches that vessel would otherwise have to be repeated in every Part B fixture, and fixtures/applicability-fixtures.json is already the contract for those. A situation fixture asserts what the pair produces, not what own shows.",
- "collapse_note": "Four expected ids changed in the PR that gave the predicate language `any_of` and `not`: `9b-small`/`9b-sail` collapsed to `rule:9b` and `10j-small`/`10j-sail` to `rule:10j`, because 9(b)'s and 10(j)'s disjunctive subjects no longer need an entry apiece. Every other expected id is unchanged. `rule:18d_i`'s expected modality moved from `shall-not-impede` to `shall-if-practicable`: the duty now lives in `effect.own` and the modality carries the 'if the circumstances of the case admit' caveat the entry used to drop.",
- "geometry_note": "The bearings, headings and speeds of every case that states its kinematics are a consistent set, and since the consistency check landed (Q-48, REQ-VERIFY-8) the suite enforces that rather than trusting the author. The two relative bearings are two readings of one line of sight, so own's bearing plus own's heading plus 180 equals the aspect plus the other's heading, modulo 360; where positions are stated they reproduce the range and both bearings; and the pair's cpa, tcpa and bearing rate are the ones the two headings and speeds produce, to the tolerances `data/facts.json` declares under `situation.geometry.consistency`. Positions are still omitted from the cases added with Rules 12-15: range and bearing are given directly, inventing a latitude to derive them from would assert more than the case knows, and the heading equation checks what the case does state. When the check landed every case that stated speeds failed the motion equations -- the pair numbers had been placeholders -- and they were re-derived; the head-on case was recast on a steady bearing and the 13(d) latch case lost `rule:7d_i`, both recorded in their narratives. Everything else, and every other expected id, is unchanged."
+ "expect_scope": "`expect` names the non-`category:display` entries a situation selects -- `category:scope`, `category:precedence` and `category:classification`. Display entries are deliberately out of scope here: a situation carries `self.fact`, so every Part C entry that matches that vessel would otherwise have to be repeated in every Part B fixture, and fixtures/applicability-fixtures.json is already the contract for those. A situation fixture asserts what the pair produces, not what self shows.",
+ "collapse_note": "Four expected ids changed in the PR that gave the predicate language `any_of` and `not`: `9b-small`/`9b-sail` collapsed to `rule:9b` and `10j-small`/`10j-sail` to `rule:10j`, because 9(b)'s and 10(j)'s disjunctive subjects no longer need an entry apiece. Every other expected id is unchanged. `rule:18d_i`'s expected modality moved from `modality:shall-not-impede` to `modality:shall-if-practicable`: the duty now lives in `effect.self` and the modality carries the 'if the circumstances of the case admit' caveat the entry used to drop.",
+ "geometry_note": "The bearings, headings and speeds of every case that states its kinematics are a consistent set, and since the consistency check landed (Q-48, REQ-VERIFY-8) the suite enforces that rather than trusting the author. The two relative bearings are two readings of one line of sight, so self's bearing plus self's heading plus 180 equals the aspect plus the other's heading, modulo 360; where positions are stated they reproduce the range and both bearings; and the pair's cpa, tcpa and bearing rate are the ones the two headings and speeds produce, to the tolerances `data/facts.json` declares under `situation.geometry.consistency`. Positions are still omitted from the cases added with Rules 12-15: range and bearing are given directly, inventing a latitude to derive them from would assert more than the case knows, and the heading equation checks what the case does state. When the check landed every case that stated speeds failed the motion equations -- the pair numbers had been placeholders -- and they were re-derived; the head-on case was recast on a steady bearing and the 13(d) latch case lost `rule:7d_i`, both recorded in their narratives. Everything else, and every other expected id, is unchanged."
 }