WIP Cleanup after Twig PR

Cleanup after Twig PR

http://tracker.phpbb.com/browse/PHPBB3-11628