Simplify inheritance and aggregation hierarchies.

简化继承和聚集层次结构。