Shell generation improvement, switch to cargo-make