Simplified fix for multiple announced waypoints.