Fix mismatch between template blocks and docs.

Fixes #639.