Rework renderer selection to only allow one match per round

Pointed out by coverty detecting a potential leak.