Support ContainerAwareInterface on widgets and clean service registration