MBug: Template cleanup.