weapon.mm: Some cleanups