Revert "Some minor Cargo style fixes."

Fixes the naval transports on the RA shellmap, which were broken by #6647.
This is the only location where you really changed logic although in a subtle way. How about only reverting this back to using `self.Location` everywhere?