Use cargo run in more places (squash)