Does this ever get hit on the first call (what used to be `round==0`)? 

- If *not*, then it seems like we just unrolled the loop, without really refactoring
- if it *does*, then I'm confused, because this was only called for `round==0` in the old code