I'm sorry, I don't know what I was reading there. The following is false:

→Also 和 and the 4th sense are problematic because 我 and 吾 don't apply to it.


It is 我、吾、和 for わ. And the WORD わ is the only one with all four senses.

Apologies for the confusion.

@@ -70 +70 @@
-<s_inf>usu. 和</s_inf>
+<s_inf>occ. 和</s_inf>

Google N-gram Corpus Counts
╭─ーー─┬───────────┬───────╮
│ 我　 │ 3.694.267 │ 75.0% │
│ 吾　 │ 1.196.770 │ 24.3% │
│ 我れ │    28.502 │  0.6% │[io] ⇒ [sK]
│ 吾れ │     7.836 │  0.2% │[io] ⇒ [sK]
╰─ーー─┴───────────┴───────╯
わろ applies to both kanji forms according to nikkoku

わ reading is also classed as [oK] by shinsen and oukoku

和 (わ) encompasses all four senses according to nikkoku, add [occ. 和 for わ] to every sense? If it were to be added as [rK] things would get messy again. Also 和 and the 4th sense are problematic because 我 and 吾 don't apply to it. It is the only variant with the fourth sense.

I suggest hiding the okurigana variants. Allows for removal of these restrictions, which made this really messy to view, but keeps the okurigana variants searchable.  

I think 和・わ should have its own entry, but the others should stay here.

@@ -14 +14 @@
-<ke_inf>&io;</ke_inf>
+<ke_inf>&sK;</ke_inf>
@@ -18 +18 @@
-<ke_inf>&io;</ke_inf>
+<ke_inf>&sK;</ke_inf>
@@ -27,2 +27 @@
-<re_restr>我</re_restr>
-<re_restr>吾</re_restr>
+<re_inf>&ok;</re_inf>
@@ -36,2 +34,0 @@
-<re_restr>我</re_restr>
-<re_restr>吾</re_restr>
@@ -42,2 +38,0 @@
-<re_restr>我</re_restr>
-<re_restr>吾</re_restr>
@@ -48 +42,0 @@
-<re_restr>我</re_restr>
@@ -52,0 +47 @@
+<s_inf>occ. 和 for わ</s_inf>
@@ -59,0 +55 @@
+<s_inf>occ. 和 for わ</s_inf>
@@ -66,0 +63 @@
+<s_inf>occ. 和 for わ</s_inf>
@@ -73 +70 @@
-<s_inf>also 和</s_inf>
+<s_inf>usu. 和</s_inf>

@@ -53 +52,0 @@
-<pos>&adj-no;</pos>
@@ -61 +59,0 @@
-<pos>&adj-no;</pos>
@@ -68 +65,0 @@
-<pos>&adj-no;</pos>