[#73435980] Templating tweaks.