Yeah lol, I know that deep inside you want it to be Oden for all the shits and giggles, which would require some abhorrent discrepancies in the story, to which this Gyukimaru point of yours pales in comparison.
like
@zzShinichi brought the point about Yamato, it really shouldn't be that big of a deal for the scabbards.