K/M n-grams:

うぐいす色	350
ウグイス色	233
鶯色	174
鴬色	20

@@ -5 +5 @@
-<keb>鶯色</keb>
+<keb>うぐいす色</keb>
@@ -8 +8,4 @@
-<keb>うぐいす色</keb>
+<keb>ウグイス色</keb>
+</k_ele>
+<k_ele>
+<keb>鶯色</keb>

鶯色	7554
うぐいす色	15501
鴬色	601


鶯茶	812
うぐいす茶	128

xref should go the other way.

@@ -18 +18 @@
-<xref type="see" seq="2190590">鶯茶</xref>
+<pos>&adj-no;</pos>

中辞典

Slightly more elegant.

@@ -18,0 +19 @@
+<gloss>olive green</gloss>

"heathenism" and "paganism" are examples of religions so I don't think they should be included here (even though they're in gg5).

@@ -11,0 +12,2 @@
+<gloss>heretical religion</gloss>
+<gloss>damaging religion</gloss>
@@ -13,2 +14,0 @@
-<gloss>heathenism</gloss>
-<gloss>paganism</gloss>

closing.  can be raised on the mailing list if needed

i mean our other option is to nuke the majority of these の entries altogether and just expect readers to know that が may be replaced by の when used prenominally

Xのadjい expressions are always prenominal. Only in relative clauses can が can be replaced with の.
The issue is that we have nothing on these entries to indicate that. The glosses and PoS tags on 住み心地が良い and 住み心地の良い are the same.

住み心地のよい	6594
住み心地のよかった	88
住み心地のよくない	23
住み心地がよい	692   <- not an entry
住み心地がよかった	215
住み心地がよくない	98

I agree that the Xのadjい are usually prenominal and inflect far less often than their equivalent Xがadjい brethren, but I think that where possible this should be reflected in their respective translations. Phrases like these ending in an adjective are more likely to be prenominal or sentence-ending. It's probably more a grammar point than something that should be tagged.
I'll close this for now to shorten the list.

i could be wrong, but if memory serves, i think we used [exp,adj-f] for these at one point, or at least the argument has been raised before.  the problem is that the inflection isn't handled correctly. i guess we could call them [exp,adj-f,adj-i] but it seems excessive

dunno what to do but i agree that it would be better if we could indicate that all of these are used prenominally

@@ -26,0 +27 @@
+<s_inf>usu. お土産</s_inf>

@@ -28,0 +29 @@
+<gloss>disservice</gloss>

How about "disservice"?

How about this for sense 3? I'm not sure we even need that sense. It's just a sarcastic use of sense 1. Daijs is the only kokugo that has it. "Souvenir" and "present" can be used in the same way in English.
I don't think we need to include "good news" in sense 2. That's just one example of figurative usage. It can be anything positive.

@@ -23 +23 @@
-<gloss>present or good news brought by a visitor</gloss>
+<gloss>present brought by a visitor</gloss>
@@ -27 +27,2 @@
-<gloss>something perceived ironically or figuratively as a gift or souvenir</gloss>
+<gloss>something unpleasant that one is given (e.g. an illness while on vacation)</gloss>
+<gloss>unwelcome gift</gloss>

I can't think of a way of making Richard's 3rd sense more succinct.

@@ -24,0 +25,4 @@
+<sense>
+<pos>&n;</pos>
+<gloss>something perceived ironically or figuratively as a gift or souvenir</gloss>
+</sense>

@@ -12,0 +13 @@
+<re_pri>spec1</re_pri>

gg5, prog

ふしゅ isn't uk. Splitting it out.

@@ -14,4 +13,0 @@
-<r_ele>
-<reb>ふしゅ</reb>
-<re_restr>浮腫</re_restr>
-</r_ele>
@@ -24,0 +21 @@
+<gloss>dropsy</gloss>

浮腫/むくみ - Koj, Daijr, GG5, GC
浮腫/ふしゅ - Koj, Daijr, GG5, 中辞典, GC
浮腫み/むくみ - 中辞典, Unidic (from 浮腫む)
むくみ(no kanji) - ルミナス

GG5 labels both むくみ and ふしゅ "医". The "Igaku" glossary uses the むくみ reading. GG5 simply points ふしゅ to むくみ. I think the whole entry should be "med" and kept as one.
As for "io", that was my first thought until I saw the 中辞典 and Unific entries. It's not really okurigana for むくみ so much as a masu stem of 浮腫む. It's all a bit bizarre as 浮腫/むくみ is probably a case of 義訓 so okurigana shouldn't come into it. On balance I'd go with "io".

@@ -8,0 +9 @@
+<ke_inf>&io;</ke_inf>
@@ -18,0 +20 @@
+<field>&med;</field>

Bulk update n-adv to n,adv
-*- via bulkupd.py -*-

@@ -37 +37,2 @@
-<pos>&n-adv;</pos>
+<pos>&n;</pos>
+<pos>&adv;</pos>

Bulk update n-adv to n,adv
-*- via bulkupd.py -*-

@@ -28 +28,2 @@
-<pos>&n-adv;</pos>
+<pos>&n;</pos>
+<pos>&adv;</pos>

Bulk update n-adv to n,adv
-*- via bulkupd.py -*-

@@ -19 +19 @@
-<pos>&n-adv;</pos>
+<pos>&adv;</pos>

Unidic classifies as 名詞, 普通名詞, 副詞可能, -> Noun, Common Noun, Adverb-able

Added adverbial noun to be consistent with Unidic, and to help distinguish it from other あたり

@@ -18,0 +19 @@
+<pos>&n-adv;</pos>
@@ -26,0 +28 @@
+<pos>&n-adv;</pos>
@@ -33,0 +36 @@
+<pos>&n-adv;</pos>

牛の鞄	42

15 google hits, most of which are EDICT.

@@ -31 +31 @@
-<s_inf>usu. after もの</s_inf>
+<s_inf>usu. as ...もの〜</s_inf>

gg5 examples

なりがち	866626
なりがちな	330829
忘れがち	187005
忘れがちな	78906
考えがち	68217
考えがちな	9045

@@ -11,0 +12 @@
+<pos>&adj-na;</pos>
@@ -21,0 +23 @@
+<pos>&adj-na;</pos>

gg5, daij

Added senses.
Sense 3 is difficult to gloss.

@@ -13,4 +13,20 @@
-<s_inf>describing a negative tendency</s_inf>
-<gloss>apt to do</gloss>
-<gloss>liable to do</gloss>
-<gloss>tend to do</gloss>
+<s_inf>after a noun or -masu stem of verb; describes a negative tendency</s_inf>
+<gloss>apt to (do)</gloss>
+<gloss>liable to</gloss>
+<gloss>prone to</gloss>
+<gloss>inclined to</gloss>
+<gloss>tend to</gloss>
+</sense>
+<sense>
+<pos>&suf;</pos>
+<misc>&uk;</misc>
+<gloss>predominantly</gloss>
+<gloss>mostly</gloss>
+<gloss>having lots of</gloss>
+</sense>
+<sense>
+<pos>&suf;</pos>
+<s_inf>usu. after もの</s_inf>
+<gloss>... reaps the rewards</gloss>
+<gloss>... takes the prize</gloss>
+<gloss>... wins</gloss>

They talk funny up there.

https://woman.mynavi.jp/article/140708-79/

@@ -20,0 +21,6 @@
+<pos>&pn;</pos>
+<dial>&tsug;</dial>
+<gloss>I</gloss>
+<gloss>me</gloss>
+</sense>
+<sense>

OK, I think.
There are about 60 entries with glosses starting "indicates ..". I think we need to come up with a uniform approach for tagging them.
Abandoning the するわ proposal.

daijs etc.

I really think a gloss like "indicates emotion or admiration" 
should be marked as [expl], whether it's the first gloss or 
not.

@@ -11,2 +11,16 @@
-<s_inf>also used by men in Kansai dialect</s_inf>
-<gloss>(sentence end) indicates emotion or admiration</gloss>
+<s_inf>at sentence end</s_inf>
+<gloss>indicates emotion or admiration</gloss>
+</sense>
+<sense>
+<pos>&prt;</pos>
+<s_inf>at sentence end</s_inf>
+<dial>&ksb;</dial>
+<gloss>indicates emphasis</gloss>
+</sense>
+<sense>
+<pos>&int;</pos>
+<gloss>wah!</gloss>
+</sense>
+<sense>
+<pos>&int;</pos>
+<gloss>boo!</gloss>

None of my references - dictionaries, books on particles, grammar references, etc. mention this. Not even Martin.
We'll need some firm evidence before contemplating changing this entry.

落とし前をつける	2800
落とし前を付ける	396

@@ -5,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>落とし前を付ける</keb>

https://www.weblio.jp/content/落とし前をつける

転じて、争いごとなどを解決するために話をつけることを意味するようになった。

@@ -14 +14,2 @@
-<gloss>to pay the debt</gloss>
+<gloss>to settle a matter</gloss>
+<gloss>to get even with someone</gloss>

Added additional PoS via batch update.Added additional PoS via batch update.
-*- via bulkupd.py -*-

@@ -12,0 +12,1 @@
+<pos>&v1;</pos>

Entry created

Google N-gram Corpus Counts
╭─ーーーーー─┬────────┬───────╮
│ 口に出す　 │ 94,687 │ 96.0% │
│ 口にだす　 │  3,156 │  3.2% │
│ くちに出す │    373 │  0.4% │
│ クチに出す │    267 │  0.3% │
│ くちにだす │    102 │  0.1% │
╰─ーーーーー─┴────────┴───────╯

@@ -5,0 +6,8 @@
+</k_ele>
+<k_ele>
+<keb>口にだす</keb>
+<ke_inf>&sK;</ke_inf>
+</k_ele>
+<k_ele>
+<keb>くちに出す</keb>
+<ke_inf>&sK;</ke_inf>

Strictly speaking, "verbally" includes writing.

@@ -13 +13 @@
-<gloss>to express (verbally)</gloss>
+<gloss>to express (orally)</gloss>

Indeed.

@@ -12,0 +13 @@
+<gloss>to express (verbally)</gloss>
@@ -14 +15 @@
-<gloss>to express</gloss>
+<gloss>to say out loud</gloss>

I feel the glosses should be amended to 
show it's specifically about actually 
SAYING these things, not for example 
putting it in writing

@@ -15,3 +15,4 @@
-<gloss>prone to</gloss>
-<gloss>liable to</gloss>
-<gloss>tending to</gloss>
+<gloss>prone (to)</gloss>
+<gloss>liable (to)</gloss>
+<gloss>apt (to)</gloss>
+<gloss>tending (to)</gloss>

陥りやすい	143763
陥り易い	6190
陥りがち	46068
陥り勝ち	262

Not in refs but there are several GG5 and Tanaka examples. I'll propose it.

@@ -16,0 +17 @@
+<gloss>tending to</gloss>

陥りやすい	143763
陥りがち 	46068

If we have this in the dictionary, should we also have 陥りがち?

Eijiro, in many GG5 examples

1.1M & 68k

https://junai.co/post/35797320/theres-a-phrase-in-japanese-katachi-kara-hairu
"There’s a phrase in Japanese, katachi kara hairu, that means getting the trappings right as the first step to the more central stuff. 
The form before the function, if you like."

@@ -13,0 +14 @@
+<gloss>to get the trappings right as the first step</gloss>

@@ -14 +14 @@
-<gloss>to start at the (wrong) end by focusing on the superficial</gloss>
+<gloss>to start (at the wrong end) by focusing on the superficial</gloss>

Thanks. Let's go with that.

Daijr, RP, https://en.wikipedia.org/wiki/Brut
ブリュット	18857

Need to resolve this one. I note we (and the JEs) have several other ...がち entries (俯きがち, 有りがち, 途切れ勝ち, etc.) but I guess I can give up on this one.

i'm not sure that the 'falling into' part should necessarily be part of the gloss...  i'd say that it makes me interpret it a little too literally.  probably there should be multiple senses here as in the おちいる entry.

i'm indifferent as to whether these stay or go.  they could probably go

青年はややもするとこの弊に陥りやすい.　Young people are apt to fall into this evil.
単調な仕事は惰性に陥りがちだ． In a monotonous job one tends to fall into a rut.

I've been thinking about this (and 陥りやすい) a little more and I'm not sure they should be entries.
"Prone to", "liable to", etc. is just the がち/やすい part. The meaning of 陥る should be included in the glosses. But then the entries seem unnecessary. They're just A+B combinations of 陥る and がち/やすい.

@@ -14,4 +14,3 @@
-<gloss>prone (to)</gloss>
-<gloss>liable (to)</gloss>
-<gloss>apt (to)</gloss>
-<gloss>tending (to)</gloss>
+<gloss>prone to falling into</gloss>
+<gloss>liable to falling into</gloss>
+<gloss>apt to fall into</gloss>

Aligning.

@@ -13,4 +13,5 @@
-<xref type="see" seq="2016470">勝ち・がち</xref>
-<gloss>prone to</gloss>
-<gloss>liable to</gloss>
-<gloss>tending to</gloss>
+<xref type="see" seq="2016470">がち</xref>
+<gloss>prone (to)</gloss>
+<gloss>liable (to)</gloss>
+<gloss>apt (to)</gloss>
+<gloss>tending (to)</gloss>

陥りがち	46068
陥りがちな	30531
陥り勝ち	262
GG5: 単調な仕事は惰性に陥りがちだ． In a monotonous job one tends to fall into a rut.
気づかぬうちに陥りがちな好ましくない事態〕 a pitfall; a danger; a hazard; a danger area.
Tanaka: 人はみな誤りに陥りがちだ。 All men are fallible.
若い人は誘惑に陥りがちである。 Young men are prone to fall into temptation.
Eijiro: 陥りがちな弱点〔人が〕: weakness to which someone is prone
不安に陥りがちな {形}: qualmish

See comments on 2739010]. If approved I'll reindex the sentences.

The JEs (GG5, etc.) only have the "on the bone" sense, e.g. 骨付きの肉.
N-grams confirm the ~の and other prenominal use.

@@ -14,2 +14,3 @@
-<pos>&n;</pos>
-<gloss>meat on the bone</gloss>
+<pos>&adj-no;</pos>
+<gloss>on the bone (meat, etc.)</gloss>
+<gloss>unboned</gloss>

https://twitter.com/search?q=骨付き&src=typed_query&f=image
I scrolled through a month's worth of pictures on twitter, one of them was of 
fish, the rest meat.

also the "skeletal system" sense should not come first, it's not common at all.

@@ -14,0 +15,4 @@
+<gloss>meat on the bone</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
@@ -18,4 +21,0 @@
-<sense>
-<pos>&n;</pos>
-<gloss>meat on the bone</gloss>
-</sense>

* nikk: 「特に、二枚におろして背骨のついている方の魚肉。」
* daijs (separate sense): 「魚を二枚におろしたとき、背骨のついているほうの身。」
* koj: 「特に魚肉で、2枚におろしたうち背骨のついた方。」

The original context I saw the term in was about chicken, but that's how the kokugos have it. Not sure how much stock should be put into Google Images, which has its own 
biases, over reliable dictionaries. Consider how none of the G-images back up the first sense...

google images

the "esp." is obviously wrong - google images is all about meat

@@ -20 +20 @@
-<gloss>meat on the bone (esp. fish halved along the spine)</gloss>
+<gloss>meat on the bone</gloss>

Daijr, Kagaku, Kenchiku
間欠河川 < 20

@@ -11,0 +12 @@
+<misc>&obsc;</misc>
@@ -12,0 +14 @@
+<gloss>intermittent stream</gloss>

alc

daijr/koj; nipponica

@@ -8 +8 @@
-<reb>われがわ</reb>
+<reb>かれがわ</reb>

@@ -11,0 +12,2 @@
+<xref type="see" seq="2842213">水無川・みずなしがわ</xref>
+<gloss>dried-up river</gloss>

Wiki
EDR etc 
https://ejje.web
lio.jp/content/%
E6%B6%B8%E3%82%8
C%E5%B7%9D

RW glossary. 0 ngrams.

@@ -11,0 +12 @@
+<misc>&obsc;</misc>

Cross language  
https://ejje.web
lio.jp/content/%
E6%81%92%E5%B8%B
8%E6%B2%B3%E5%B7
%9D

バブル時代 slang I think

@@ -10 +10 @@
-<s_inf>80's slang</s_inf>
+<s_inf>1980s slang</s_inf>

ザギンでシースー	470

Hmmm. Quite a few Google hits.

@@ -8 +8 @@
-<pos>&n;</pos>
+<pos>&exp;</pos>

Google
heard on the TV show "Terrace House"

GG5: 人気が出る become popular; rise to popularity; (col) catch on
人気が出る	62383
人気がでる	11180

(a) "exp" goes first
(b) we don't tag "XがVerb" expressions as "vi".

@@ -6,0 +7,3 @@
+<k_ele>
+<keb>人気がでる</keb>
+</k_ele>
@@ -10,0 +14 @@
+<pos>&exp;</pos>
@@ -12,2 +15,0 @@
-<pos>&vi;</pos>
-<pos>&exp;</pos>
@@ -15,0 +18 @@
+<gloss>to catch on</gloss>

weblio, 京大-NICT 日英中基本文データ https://ejje.weblio.jp/content/人気が出る

水無し川	1020
水無川	11754
Daijr, GG5

みなしがわ has some other poetical meanings.

@@ -5,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>水無し川</keb>

https://ja.wikipedia.org/wiki/水無川
nipponica etc https://kotobank.jp/word/水無川-1597407

Not only a proper noun, it seems

シースー	6000
https://word-dictionary.jp/posts/2966  etc. etc.

@@ -10 +9,0 @@
-<xref type="see" seq="1595650">寿司</xref>

https://meaning.jp/posts/50

ミシン縫い	12632	  
ミシン縫いの	1460	  
ミシン縫いで	1249	  
ミシン縫いを	664

I think this should be glossed as a noun.

@@ -10,0 +11 @@
+<pos>&n;</pos>
@@ -12,2 +13,2 @@
-<gloss>machine-sewn</gloss>
-<gloss>machine-sewed</gloss>
+<gloss>machine sewing</gloss>
+<gloss>sewing by machine</gloss>

GG5

@@ -11 +11 @@
-<pos>&n;</pos>
+<pos>&adj-no;</pos>
@@ -12,0 +13 @@
+<gloss>machine-sewed</gloss>

斎藤和英大辞典 https://ejje.weblio.jp/sentence/content/ミシン縫い
https://www.uniqlo.com/jp/gu/item/314438

Not sure about PoS

gg5, Readers, www-images
櫛板	305
くし板	263

gg5, daij, koj
黒目勝ち	1033
黒目がち	16481
黒目がちな	7562	    
黒目がちの	3184

https://ja.m.wikipedia.org/wiki/水無川_(%E7%A5%9E%E5%A5%88%E5%B7%9D%E7%
9C%8C)

@@ -5,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>みずなし川</keb>

https://ejje.weblio.jp/content/水無川

JST https://ejje.weblio.jp/content/水無川

@@ -11,2 +11,2 @@
-<misc>&unclass;</misc>
-<gloss>Mizunashigawa</gloss>
+<misc>&place;</misc>
+<gloss>Mizunashigawa River</gloss>

@@ -13 +13 @@
-<gloss>GU (Japanese clothing retailer)</gloss>
+<gloss>GU (clothing retailer)</gloss>

https://ja.wikipedia.org/wiki/ジーユー

A bit more.

@@ -13 +13 @@
-<gloss>GU (retailer)</gloss>
+<gloss>GU (Japanese clothing retailer)</gloss>

Adding spec1
-*- via bulkupd.py -*-

@@ -8,0 +9 @@
+<re_pri>spec1</re_pri>