In some cases I’ve been using waterway=link to complete the topology. In other cases I’ve been using relations with type=waterway + waterway=river, and tagging the individual members with role main_stream or side_stream, accordingly. Either approach seems preferable to deletion. What do you think?