Fix unusual numbers of rounds. Simplify implementation.