I definitely like the unwound version with the `0` case broken out.

The trailing `-` in the comment looks a bit strange.