Minor misc tidies

Why are we using a `Repeater`? Why aren't we just doing `Asserts.succeedsEventually`, replacing the return ... with `assertTrue(...)`?

But it was already like that, so not important for this PR.