Some more work on weapon parsing stuff.