Tidy up messages for --dry-run, 2nd attempt