Block spec escapes

Fixes #391.
Fixes #399.