Fix twig bugs affecting goals & ecommerce pages.