fix #3351: More sensible default for waypoint type on creation