Refactor twig service provision in prep for custom template loader