Corpse drop weapon after random interval.
Minor tidy up.