Make Weapon class heirarchy more robust.