Revert "Some minor Cargo style fixes."

Fixes the naval transports on the RA shellmap, which were broken by #6647.
The other style fixes are worth to keep.