Keeping track of --use and --run arguments more correctly