Make conjoint waterway/administrative boundary play nicely.