Stub encoder classes.
Some minor changes.