A few more minor changes to computing blocks and indexing in the kernel.