Kill Cargo properly

to avoid problems related to it such as #2983 and wrong kill/deaths statistics as suggested by @pchote in IRC.