Add better dryrun support.