improve validity check to handle constant-trip-count loops more