Reorganization and support for special-C blocks