MBug: Cleanup template syntax.