GenericContainerBlock dumbness.
More fixes, 374 errors.