Revert "Some minor Cargo style fixes."

Fixes the naval transports on the RA shellmap, which were broken by #6647.
I just noticed that this already is the revert and I confused this with the original diff. This wants to be reverted back to `self.World.Map.CellContaining(self.CenterPosition);` and not `self.Location`.