I feel like the explanation of a KIntaro doll is really an explanation of the stereotypical attributes of Kintaro himself, not just of 
dolls made to look like him, so it belongs in sense 1 rather than sense 2.
(except "plump _red_ face" appears to be wrong for both dolls and other depictions, or at least very rare, I see only one doll with a 
red face in the google image results for 金太郎人形).

@@ -14 +14,2 @@
-<gloss g_type="expl">hero boy of Japanese folklore, who befriended animals and had supernatural strength</gloss>
+<gloss>Golden Boy</gloss>
+<gloss g_type="expl">folklore boy hero and defeater of demons; usu. depicted with a bob cut, carrying an axe, and wearing a red apron</gloss>
@@ -18 +19 @@
-<gloss>Kintarō doll (usu. having a plump red face, carrying an axe, and wearing a red apron)</gloss>
+<gloss>Kintarō doll</gloss>

@@ -13 +13 @@
-<gloss>Kintaro</gloss>
+<gloss>Kintarō</gloss>
@@ -18 +18 @@
-<gloss>Kintaro doll (usu. having a plump red face, carrying an axe, and wearing a red apron)</gloss>
+<gloss>Kintarō doll (usu. having a plump red face, carrying an axe, and wearing a red apron)</gloss>

@@ -13 +13,2 @@
-<gloss>Kintaro (hero boy of Japanese folklore, who befriended animals and had supernatural strength)</gloss>
+<gloss>Kintaro</gloss>
+<gloss g_type="expl">hero boy of Japanese folklore, who befriended animals and had supernatural strength</gloss>