[c12485] Improve WaypointMMGen