Move some template-related methods to <template>.
Follow-up on recent test case failures.
More follow-up on recent test case failures.
Temporary change for Sauce.