-Fix [FS#5758]: Mixtures of old and new flows could create cycles.