Tidy up g_weapon.c some more.