Same for 'after' waypoints, too!