Move parser back into engine, revert TemplateLoader breakage