Tiny cleanup in the Component model