Fix duplicate removal of with-fluids.