More templating work.