I think the issue here is because Weapons are now attached as a "Prop" bone, and not parented to the "Weapon" bones when drawn (using Z). They do seem to parent to the scabbards, holsters, and sheathes when not drawn, however.
A props category may be needed to resolve this and put under "Equipment", noting that Fashion Accessories are also props, and some, such as the Archangel Wings create new bones parented to a "Prop"
A props category may be needed to resolve this and put under "Equipment", noting that Fashion Accessories are also props, and some, such as the Archangel Wings create new bones parented to a "Prop"