Yet more tweaks to allow this to work with any versions of Symfony, Silex, et al.