Little bit of template cleanup.