More tweaks to improve the compatibility of this library with other projects that need fixed versions of Symfony components.