Issue #850728 followup by LewisNyman Bartik: template.php cleanups.
Issue #2077599 by chx, olli: Xss Split argument passing needs to come out of stone age.