Moved the auto-setting of --verbose when --dry-run is specified into