-a and -d are now per-command options.