Keeping track of inheritance now moved to compiler: Cleanup and adapt.