More Blocks code cleanup.