[#85002150] Less inheritance, more composition.