Instead, DomainFactoryImpl.updateCourseWaypoints re-uses existing Waypoint objects by explicit comparison of their ControlPoint objects, in order.