Updating Twig/Mustache adapters (2)