Revert "Some minor Cargo style fixes."

Fixes the naval transports on the RA shellmap, which were broken by #6647.
I suspect that it was the change from `self.World.Map.CellContaining(self.CenterPosition);` to `self.Location` that introduced the regression.  But you are right, I will try reverting just that change and see if we can keep the rest of the fixes.