Minor template cleanup.