Merge pull request #399 from dtolnay/block

Preserve meaning of block boundaries