I think, proper fix would be to remove all splits on those roads, which is:
 a) Huge amount of work,
 b) Might raise some questions from other contributors.

Therefor it has to be properly communicated before execution. I'm not sure where to start.
