Fixes for diff class with empty blocks.