#342, Cleaning up the embedded template.