My goal was to replace subclassing with something more concrete, and the change did do that, but I think some of the semantics need sharpening