More work on weapon parsing.