Merge "Flip set subtraction to produce correct list of tasks to remove." into main