What's the difference between 'combat' and 'weaponry?' I'd assume a combat class would cover certain kinds of weaponry by default. After all, you don't take a class for sculpting and then another for hammers and chisels.