Fix treatment of blocks.