Make rivers draw from the river group pool instead of swamps.