Cleaned up the inheritance tree a bit.