Removed intermediate classes.
Blocks couldn't be diffed against normal stats.