[#2735] Minor tweaks to the big, nice refactoring of the templating component done by WouterJ