Don't throw out waypoints if they share a resref with creatures. Instead, compare against other known waypoints.