Update template comments and remove misplaced template comments.