Fixing up block definitions.