Use iterators instead of references to waypoints.
Use iterators instead of references to waypoints.