diff --git a/lib/src/translator/Dictionary.gf b/lib/src/translator/Dictionary.gf
index 6af3af31c..2dbfd5b8d 100644
--- a/lib/src/translator/Dictionary.gf
+++ b/lib/src/translator/Dictionary.gf
@@ -41019,8 +41019,6 @@ fun passee_A : A ;
 fun passenger_N : N ;
 fun passepartout_N : N ;
 fun passer_N : N ;
-fun passer_by_N : N ;
-fun passerby_N : N ;
 fun passerine_A : A ;
 fun passerine_N : N ;
 fun passim_Adv : Adv ;
diff --git a/lib/src/translator/DictionaryBul.gf b/lib/src/translator/DictionaryBul.gf
index b55bb1021..985e24c01 100644
--- a/lib/src/translator/DictionaryBul.gf
+++ b/lib/src/translator/DictionaryBul.gf
@@ -41062,8 +41062,6 @@ lin passee_A = variants {} ;
 lin passenger_N = mkN007 "пасажер";
 lin passepartout_N = mkN073 "паспарту";
 lin passer_N = mkN007a "минувач" ;
-lin passer_by_N = mkN007a "минувач" ;
-lin passerby_N = mkN007a "минувач" ;
 lin passerine_A = mkA076 "врабчов" ;
 lin passerine_N = mkN065 "врабче" ;
 lin passim_Adv = variants {} ;
diff --git a/lib/src/translator/DictionaryDut.gf b/lib/src/translator/DictionaryDut.gf
index 4f2875937..f047e2f99 100644
--- a/lib/src/translator/DictionaryDut.gf
+++ b/lib/src/translator/DictionaryDut.gf
@@ -475,7 +475,7 @@ lin aggression_N = mkN "agressie" ; -- status=guess
 lin aggressive_A = mkA "agressief" ; -- status=guess
 lin agile_A = mkA "beweeglijk" | mkA "lenig" | mkA "behendig" ; -- status=guess status=guess status=guess
 lin agility_N = mkN "wendbaarheid" feminine ; -- status=guess
-lin agitation_N = mkN "opwinding" feminine | mkN "agitatie" feminine | mkN "troebelen {p}" ; -- status=guess status=guess status=guess
+lin agitation_N = mkN "opwinding" feminine | mkN "agitatie" feminine | mkN "troebelen" ; -- status=guess status=guess status=guess
 lin agnes_PN = mkPN "Agnes" ; -- src=eng status=guess
 lin agnostic_A = mkA "agnostisch" ; -- status=guess
 lin agnostic_N = mkN "agnosticus" ; -- status=guess
diff --git a/lib/src/translator/DictionaryEng.gf b/lib/src/translator/DictionaryEng.gf
index f00883b3b..6164cfc0b 100644
--- a/lib/src/translator/DictionaryEng.gf
+++ b/lib/src/translator/DictionaryEng.gf
@@ -41203,9 +41203,7 @@ lin passe_A = compoundA (mkA "passé");
 lin passee_A = compoundA (mkA "passée");
 lin passenger_N = mkN human (mkN "passenger" "passengers");
 lin passepartout_N = mkN "passepartout" "passepartouts";
-lin passer_N = mkN "passer" ;
-lin passer_by_N = mkN "passer-by" "IRREG";
-lin passerby_N = mkN "passerby" ;
+lin passer_N = variants {mkN "passer"; mkN "passer-by"; mkN "passerby"};
 lin passerine_A = mkA "passerine" ;
 lin passerine_N = mkN "passerine" ;
 lin passim_Adv = mkAdv "passim";
diff --git a/lib/src/translator/DictionaryEst.gf b/lib/src/translator/DictionaryEst.gf
index 8620fea4f..c3c907ac3 100644
--- a/lib/src/translator/DictionaryEst.gf
+++ b/lib/src/translator/DictionaryEst.gf
@@ -14630,7 +14630,7 @@ lin pasqueflower_N = mkN "karukell" ;
 lin passage_N = mkN "läbimine" | mkN "läbipääs" | mkN "lõik" | mkN "passaaž" | mkN "tekstilõik" | mkN "vahekäik" ;
 lin passageway_N = mkN "vahekäik" ;
 lin passenger_N = mkN "reisi-" | mkN "reisija" ;
-lin passerby_N = mkN "mööduja" ;
+lin passer_N = mkN "mööduja" ;
 lin passerine_N = mkN "värvuline" ;
 lin passing_N = mkN "möödasõit" | mkN "mööduv" ;
 lin passionflower_N = mkN "kannatuslill" ;
diff --git a/lib/src/translator/DictionaryFin.gf b/lib/src/translator/DictionaryFin.gf
index d23d0e2fc..30027015c 100644
--- a/lib/src/translator/DictionaryFin.gf
+++ b/lib/src/translator/DictionaryFin.gf
@@ -37411,8 +37411,7 @@ lin passage_N = mkWN (k10 "siirtymä") ; --UNCHK
 lin passageway_N = mkWN (k10 "käytävä") ; --UNCHK
 lin passbook_N = mkWN (compoundN "pankki" (k9 "kirja")) ; --UNCHK
 lin passenger_N = mkWN (k10 "matkustaja") ;
-lin passer_N = mkWN (compoundN "Passer-" (k1A "suku")) ; --UNCHK
-lin passerby_N = mkWN (compoundN "ohi" (k12 "kulkija")) ; --UNCHK
+lin passer_N = mkWN (compoundN "Passer-" (k1A "suku")) | mkWN (compoundN "ohi" (k12 "kulkija")); --UNCHK
 lin passerine_A = mkWA "varpuslintu-" ; --UNCHK
 lin passerine_N = mkWN (compoundN "varpus" (k1A "lintu")) ; --UNCHK
 lin passim_Adv = mkWAdv "eri" "kohdissa" "teosta" ; --UNCHK
diff --git a/lib/src/translator/DictionaryFre.gf b/lib/src/translator/DictionaryFre.gf
index a61190a0d..678e6767b 100644
--- a/lib/src/translator/DictionaryFre.gf
+++ b/lib/src/translator/DictionaryFre.gf
@@ -21545,8 +21545,7 @@ lin pass_up_V2 = prepV2 OP_pass_V OP_up_Prep ; -- guess-p-verb
 lin passage_N = mkN "passage" masculine ; -- tocheck
 lin passageway_N = mkN "passage" masculine ; -- tocheck
 lin passenger_N = mkN "passager" masculine ; -- tocheck
-lin passer_by_N = mkN "passant" masculine ; -- tocheck
-lin passerby_N = mkN "passant" | mkN "passante" | mkN "passer" ; -- UWN
+lin passer_N = mkN "passant" masculine | mkN "passante" | mkN "passer" ; -- UWN
 lin passing_N = mkN "passing" masculine ; -- tocheck
 lin passion_N = mkN "passion" feminine | mkN "Passion" feminine ; -- tocheck
 lin passionate_A = mkA "passionné" ; -- tocheck
diff --git a/lib/src/translator/DictionaryGer.gf b/lib/src/translator/DictionaryGer.gf
index 4ce3c143e..b1ebfdcfe 100644
--- a/lib/src/translator/DictionaryGer.gf
+++ b/lib/src/translator/DictionaryGer.gf
@@ -41021,8 +41021,6 @@ lin passee_A = variants {} ;
 lin passenger_N = mkN "Passagier" "Passagiere" masculine | mkN "Fahrgast" "Fahrgäste" masculine ; -- status=guess status=guess
 lin passepartout_N = variants {} ;
 lin passer_N = mkN "Passant" "Passanten" masculine | mkN "Passantin" feminine ; -- status=guess status=guess
-lin passer_by_N = variants {} ;
-lin passerby_N = variants {} ;
 lin passerine_A = variants {} ;
 lin passerine_N = variants {} ;
 lin passim_Adv = mkAdv "passim" ; -- status=guess
diff --git a/lib/src/translator/DictionaryIta.gf b/lib/src/translator/DictionaryIta.gf
index f303acec4..ddb3bb1e1 100644
--- a/lib/src/translator/DictionaryIta.gf
+++ b/lib/src/translator/DictionaryIta.gf
@@ -19201,7 +19201,6 @@ lin passageway_N = mkN "corsia" ; -- status=guess
 lin passbook_N = mkN "libretto" | mkN "libretto_a_risparmio" | mkN "libretto_di_risparmio" ; -- UWN
 lin passenger_N = mkN "passeggero" ; -- status=guess
 lin passer_N = mkN "passante" masculine | mkN "passanti" masculine ; -- status=guess status=guess
-lin passerby_N = mkN "passante" ; -- UWN
 lin passion_N = mkN "passione" feminine ; -- status=guess
 lin passionate_A = mkA "appassionato" ; -- status=guess
 lin passionflower_N = mkN "passiflora" ; -- UWN
diff --git a/lib/src/translator/DictionarySwe.gf b/lib/src/translator/DictionarySwe.gf
index 7a92415f4..5eaf0bf21 100644
--- a/lib/src/translator/DictionarySwe.gf
+++ b/lib/src/translator/DictionarySwe.gf
@@ -40653,8 +40653,6 @@ lin passee_A = variants {} ; -- status=guess
 lin passenger_N = mkN "passagerare" utrum | mkN "passagerare" utrum ; -- SaldoWN -- comment=2
 lin passepartout_N = mkN "passepartout" "passepartouter" ;
 lin passer_N = mkN "förbipasserande" | mkN "förbigående" ; -- status=guess status=guess
-lin passer_by_N = mkN "förbipasserande"; -- src=google
-lin passerby_N = mkN "förbipasserande"; -- src=google
 lin passerine_A = variants {} ; -- status=guess
 lin passerine_N = mkN "tätting" ; -- SaldoWN
 lin passim_Adv = variants {} ; -- status=guess
diff --git a/lib/src/translator/DictionaryTha.gf b/lib/src/translator/DictionaryTha.gf
index 92b13f9dc..527428875 100644
--- a/lib/src/translator/DictionaryTha.gf
+++ b/lib/src/translator/DictionaryTha.gf
@@ -27212,8 +27212,7 @@ lin passageway_N = mkN "ช่อง" | mkN "ทางผ่าน" | mkN "เ
 lin passbook_N = mkN "สมุดธนาคาร" | mkN "สมุดฝากและถอนเงินของธนาคาร" ; -- src=panlex
 lin passe_A = mkA "ชรา" | mkA "อดีต" | mkA "พ้นสมัย" | mkA "ร่วงโรย" | mkA "ล้าสมัย" | mkA "หมดสมัย" ; -- src=panlex
 lin passenger_N = mkN "ผู้โดยสาร" | mkN "คนโดยสาร" | mkN "คนเดินทาง" | mkN "ผู้โดยสาร" | mkN "ผู้เดินทาง" ; -- src=panlex
-lin passer_N = mkN "พาสเซอร์" | mkN "ผู้สอบผ่าน" | mkN "ผู้เดินผ่าน" | mkN "ผู้ผ่านการสอบ" | mkN "ผู้ผ่าน" | mkN "คนเดินผ่าน" | mkN "ผู้ทําให้ผ่าน" | mkN "ผู้ลงมติให้ผ่านได้" ; -- src=panlex
-lin passerby_N = mkN "ผู้เดินผ่าน" | mkN "คนผ่านไปมา" | mkN "คนเดินผ่าน" | mkN "ผู้สัญจรไปมา" ; -- src=panlex
+lin passer_N = mkN "พาสเซอร์" | mkN "ผู้สอบผ่าน" | mkN "ผู้เดินผ่าน" | mkN "ผู้ผ่านการสอบ" | mkN "ผู้ผ่าน" | mkN "คนเดินผ่าน" | mkN "ผู้ทําให้ผ่าน" | mkN "ผู้ลงมติให้ผ่านได้" | mkN "ผู้เดินผ่าน" | mkN "คนผ่านไปมา" | mkN "คนเดินผ่าน" | mkN "ผู้สัญจรไปมา" ; -- src=panlex
 lin passerine_N = mkN "แพสเซอไรน์" ; -- src=panlex
 lin passing_Adv = mkAdv "สุดยอด" | mkAdv "อย่างยิ่ง" ; -- src=panlex
 lin passing_N = mkN "สิ้นใจ" | mkN "การจากไป" | mkN "การผ่านพ้น" | mkN "การเสียชีวิต" | mkN "การถึงแก่กรรม" | mkN "การเคลื่อนผ่าน" | mkN "การทำระยะด้วยการขว้างลูก" | mkN "การผ่านพ้นไปอย่างรวดเร็ว" ; -- src=panlex