Implement a better fix for the missing output due to our shouldExtendBlock optimization. Revert shouldExtendBlock to what it was, but update the output step to do the right thing if it finds a block within a block.