Fix a typo, remove special treatment of one type of weapon.