cBlockInfo-related changes from #723

Merged by hand because of #738.