Some code cleanups in More Blocks.