Tidy `unfold`.

See #181.