Issue #3161777: Moved Vefl service into the trait.

This makes the Vefl trait self sufficient by moving the Vefl service inside the trait itself, thus removing the need to instantiate the service through __construct / create methods on the class using the trait.