Simplify unrolling

The extra if is not need since we know in advance that the branch will
be taken.
Simplify unrolling futher