Cleanup.
Fix virtual inheritance.