Yeah, I'll have to come up with something. At the moment the only way to swap the main-hand knife is to give the dwarf a different weapon.