Refactor content blocks to ignore lines

We can simplify our previous standalone determination logic by merging content blocks again.

Fixes #854