Obviously the time has come that when teams are not in a straight elimination (knock-out) competition, but are playing a 'round-robin' or similar, that the draw for the knock-out section is only made after any qualifying rounds have been decided.
Okay, that might mean facing the same opponents twice before the finals, but if the draw is fair then that should not be a problem.