I was unsure if it is a good idea to intervene here as well, as it may create unwanted side-effects on own waypoints. My main intention was to somewhat fix the oc waypoints without breaking other parts.
To get the complete waypoint-handling straight will require some more research and thinking.