Make remove temp rivers more robust.