Use iterators instead of references to waypoints.