Fix enumerators.
Optimize empty blocks.