Some more minor changes for the skip/missing/dry_run code.