Fix for duplicate (rotten) in container names

Removed some erratic code. There wasn't any need to make containers of
food a special case, was there? The whole function is still a mess,
though.