A few post-merge fixups for #429.

- Add changelog.
- Combine the two specs into one -- I consider it to
  be one behavior (e.g. it forwards the block).
- Allow a `do...end` block as well, and specify what
  happens when both block forms are used.