Another small refactoring to make control flow easier to understand.

2 jobs for 1872-key-agreement in 9 minutes and 30 seconds (queued for 3 minutes and 9 seconds)
Status Job ID Name Coverage
  Test
passed #8808
test

00:09:30

 
  Optional Tests
manual #8809
allowed to fail manual
manual_tests