Some improvements to the Cargo compiler file.