Don't hate me, but can you add the `ServiceLocatorInterface` as a constructor parameter and get rid of the `ServiceLocatorAwareInterface` implementation please?