Exchanged service definitions to make use of the ExpressionLanguage component of Symfony.